Merge pull request #584 from yast/rspec-kw-hash

Fix hash vs keyword arguments in RSpec expectations (bsc#1204871)
yast · Oct 31, 2022 · 0d7fdc1 · 0d7fdc1
2 parents 0fb5897 + 5b52161
commit 0d7fdc1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 31 10:14:45 UTC 2022 - Martin Vidner <mvidner@suse.com>
+
+- Fix hash vs keyword arguments in RSpec expectations (bsc#1204871)
+- 4.5.8
+
 -------------------------------------------------------------------
 Tue Oct 25 12:19:45 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.5.7
+Version:        4.5.8
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

diff --git a/test/helpers_spec.rb b/test/helpers_spec.rb
@@ -166,14 +166,15 @@
   describe ".write_config" do
     it "writes the current configuration" do
       url = "https://example.com"
+      config = {
+        url:      url,
+        insecure: false
+      }
       expect(Registration::UrlHelpers).to receive(:registration_url) \
         .and_return(url)
       expect(Registration::Helpers).to receive(:insecure_registration) \
         .and_return(false)
-      expect(SUSE::Connect::YaST).to receive(:write_config).with(
-        url:      url,
-        insecure: false
-      )
+      expect(SUSE::Connect::YaST).to receive(:write_config).with(config)
 
       Registration::Helpers.write_config
     end

diff --git a/test/registration/clients/scc_auto_test.rb b/test/registration/clients/scc_auto_test.rb
@@ -47,8 +47,9 @@
     end
 
     it "imports given hash" do
-      expect(config).to receive(:import).with("reg_code" => "SOME-CODE")
-      subject.import("reg_code" => "SOME-CODE")
+      settings = { "reg_code" => "SOME-CODE" }
+      expect(config).to receive(:import).with(settings)
+      subject.import(settings)
     end
 
     context "when the registration code is not specified" do
@@ -65,7 +66,8 @@
       end
 
       it "reads the code from the registration codes loader" do
-        expect(config).to receive(:import).with("reg_code" => "INTERNAL-USE-ONLY")
+        imported = { "reg_code" => "INTERNAL-USE-ONLY" }
+        expect(config).to receive(:import).with(imported)
         subject.import({})
       end
 

diff --git a/test/registration_spec.rb b/test/registration_spec.rb
@@ -62,8 +62,9 @@
         receive(:registered)
 
       # the received product renames are passed to the software management
+      renames = { "SUSE_SLES_SAP" => "SLES_SAP" }
       expect(Registration::SwMgmt).to receive(:update_product_renames)
-        .with("SUSE_SLES_SAP" => "SLES_SAP")
+        .with(renames)
 
       allow(SUSE::Connect::YaST).to receive(:credentials)
         .with(SUSE::Connect::YaST::GLOBAL_CREDENTIALS_FILE)