Fixed tests

yast · Sep 14, 2018 · 6ae05a8 · 6ae05a8
1 parent 18d22c3
commit 6ae05a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/library/control/src/modules/WorkflowManager.rb b/library/control/src/modules/WorkflowManager.rb
@@ -1497,7 +1497,8 @@ def merge_product_workflow(product)
         Yast::WorkflowManager.RemoveWorkflow(
           :package,
           merged_base_product.installation_package_repo,
-          merged_base_product.installation_package)
+          merged_base_product.installation_package
+        )
       end
 
       AddWorkflow(:package, product.installation_package_repo, product.installation_package)

diff --git a/library/control/test/workflow_manager_test.rb b/library/control/test/workflow_manager_test.rb
@@ -437,7 +437,8 @@
 
   describe "#merge_product_workflow" do
     let(:product) do
-      instance_double("Y2Packager::Product", label: "SLES", installation_package: "package")
+      instance_double("Y2Packager::Product", label: "SLES", installation_package: "package",
+        installation_package_repo: 42)
     end
 
     before do
@@ -448,7 +449,7 @@
     end
 
     it "merges installation package workflow" do
-      expect(subject).to receive(:AddWorkflow).with(:package, 0, "package")
+      expect(subject).to receive(:AddWorkflow).with(:package, product.installation_package_repo, "package")
       subject.merge_product_workflow(product)
     end
 
@@ -458,7 +459,7 @@
       end
 
       it "removes the previous workflow" do
-        expect(subject).to receive(:RemoveWorkflow).with(:package, 0, "package")
+        expect(subject).to receive(:RemoveWorkflow).with(:package, product.installation_package_repo, "package")
         subject.merge_product_workflow(product)
       end
     end