hammer_cli_foreman 2.1.0 → 2.3.0

data/test/unit/option_sources/id_params_test.rb

@@ -15,7 +15,7 @@ describe HammerCLIForeman::OptionSources::IdParams do
       hg_cmd.expects(:get_resource_id).with { |res| res.name == :domains }.never
       option_data = { 'option_domain_id' => 3, 'option_domain_name' => 'test' }
       params = id_params_source.get_options([], option_data)
-      params.must_equal option_data
+      _(params).must_equal option_data
     end
 
     it "resolves param when unset" do
@@ -24,7 +24,7 @@ describe HammerCLIForeman::OptionSources::IdParams do
       option_data = { 'option_domain_id' => nil, 'option_domain_name' => 'test' }
       expected_data = { 'option_domain_id' => 1, 'option_domain_name' => 'test' }
       params = id_params_source.get_options([], option_data)
-      params.must_equal expected_data
+      _(params).must_equal expected_data
     end
   end
 end

data/test/unit/option_sources/ids_params_test.rb

@@ -15,7 +15,7 @@ describe HammerCLIForeman::OptionSources::IdsParams do
       cmd.expects(:get_resource_ids).with { |res| res.name == :locations }.never
       option_data = { 'option_location_ids' => [3], 'option_location_names' => 'test' }
       params = ids_params_source.get_options([], option_data)
-      params.must_equal option_data
+      _(params).must_equal option_data
     end
 
     it "resolves param when unset" do
@@ -24,7 +24,7 @@ describe HammerCLIForeman::OptionSources::IdsParams do
       option_data = { 'option_location_ids' => nil, 'option_location_names' => 'test' }
       expected_data = { 'option_location_ids' => [1], 'option_location_names' => 'test' }
       params = ids_params_source.get_options([], option_data)
-      params.must_equal expected_data
+      _(params).must_equal expected_data
     end
   end
 end

data/test/unit/output/formatters_test.rb

@@ -19,13 +19,13 @@ describe HammerCLIForeman::Output::Formatters::StructuredReferenceFormatter do
   context 'with symbol keys' do
     it 'formats name' do
       options = {:display_field_key => :server_name}
-      formatter.format(reference, options).must_equal('Name' => "#{reference_str_keys['server_name']}")
+      _(formatter.format(reference, options)).must_equal('Name' => "#{reference_str_keys['server_name']}")
     end
 
     it 'formats id' do
       options = {:display_field_key => :server_name,
                  :details => {:structured_label => 'Id', :key => :server_id}}
-      formatter.format(reference, options)
+      _(formatter.format(reference, options))
         .must_equal('Name' => "#{reference_str_keys['server_name']}", 'Id' => reference_str_keys['server_id'])
     end
   end
@@ -33,13 +33,13 @@ describe HammerCLIForeman::Output::Formatters::StructuredReferenceFormatter do
   context 'with string keys' do
     it 'formats name' do
       options = {:display_field_key => :server_name}
-      formatter.format(reference_str_keys, options).must_equal('Name' => "#{reference_str_keys['server_name']}")
+      _(formatter.format(reference_str_keys, options)).must_equal('Name' => "#{reference_str_keys['server_name']}")
     end
 
     it 'formats id' do
       options = {:display_field_key => :server_name,
                  :details => {:structured_label => 'Id', :key => :server_id}}
-      formatter.format(reference_str_keys, options).must_equal('Name' => "#{reference_str_keys['server_name']}", 'Id' => reference_str_keys['server_id'])
+      _(formatter.format(reference_str_keys, options)).must_equal('Name' => "#{reference_str_keys['server_name']}", 'Id' => reference_str_keys['server_id'])
     end
   end
 end
@@ -59,7 +59,7 @@ describe HammerCLIForeman::Output::Formatters::ReferenceFormatter do
   end
 
   it 'recovers when the resource is missing' do
-    formatter.format(nil).must_equal ''
+    _(formatter.format(nil)).must_equal ''
   end
 
   context 'with symbol keys' do
@@ -68,40 +68,40 @@ describe HammerCLIForeman::Output::Formatters::ReferenceFormatter do
     end
 
     it 'formats name' do
-      formatter.format(reference_sym_keys, {}).must_equal("#{reference_sym_keys[:name]}")
+      _(formatter.format(reference_sym_keys, {})).must_equal("#{reference_sym_keys[:name]}")
     end
 
     it 'can override name key' do
       options = {:display_field_key => :another_name}
-      formatter.format(reference_sym_keys, options).must_equal("#{reference_sym_keys[:another_name]}")
+      _(formatter.format(reference_sym_keys, options)).must_equal("#{reference_sym_keys[:another_name]}")
     end
 
     it 'formats id' do
-      options = {:details => {:key => :id, :label => 'Id'}, :context => {:show_ids => true}}
-      formatter.format(reference_sym_keys, options)
+      options = {:details => {:key => :id, :label => {:target => 'Id'}}, :context => {:show_ids => true}}
+      _(formatter.format(reference_sym_keys, options))
         .must_equal("Server (Id: #{reference_sym_keys[:id]})")
     end
 
     it 'formats details' do
       options = { :details => { :label => _('url'), :key => :url } }
-      formatter.format(reference_sym_keys, options).must_equal("Server (url: #{reference_sym_keys[:url]})")
+      _(formatter.format(reference_sym_keys, options)).must_equal("Server (url: #{reference_sym_keys[:url]})")
     end
 
     it 'formats multiple details' do
       options = { :details => [{ :label => _('url'), :key => :url },
                                {:label => _('desc'), :key => :desc }]
                 }
-      formatter.format(reference_sym_keys, options)
+      _(formatter.format(reference_sym_keys, options))
         .must_equal("Server (url: #{reference_sym_keys[:url]}, desc: #{reference_sym_keys[:desc]})")
     end
 
     it 'formats details and id' do
       options = {:context => {:show_ids => true},
-                 :details => [{ :label => _('url'), :key => :url },
+                 :details => [{:label => _('url'), :key => :url },
                               {:label => _('desc'), :key => :desc },
                               {:label => _('Id'), :key => :id }]
                 }
-      formatter.format(reference_sym_keys, options)
+      _(formatter.format(reference_sym_keys, options))
         .must_equal("Server (url: #{reference_sym_keys[:url]}, desc: #{reference_sym_keys[:desc]}, Id: #{reference_sym_keys[:id]})")
     end
   end
@@ -114,36 +114,36 @@ describe HammerCLIForeman::Output::Formatters::ReferenceFormatter do
     end
 
     it 'formats name' do
-      formatter.format(reference_str_keys, {}).must_equal("#{reference_str_keys['name']}")
+      _(formatter.format(reference_str_keys, {})).must_equal("#{reference_str_keys['name']}")
     end
 
     it 'can override name key' do
       options = {:display_field_key => :another_name}
-      formatter.format(reference_str_keys, options).must_equal("#{reference_str_keys['another_name']}")
+      _(formatter.format(reference_str_keys, options)).must_equal("#{reference_str_keys['another_name']}")
     end
 
     it 'formats id when show_ids is true' do
-      options = {:details => {:label => 'Id', :key => :id, :id => 1}, :context => {:show_ids => true}}
-      formatter.format(reference_str_keys, options)
+      options = {:details => {:label => {:target => 'Id'}, :key => :id, :id => 1}, :context => {:show_ids => true}}
+      _(formatter.format(reference_str_keys, options))
                .must_equal("Server (Id: #{reference_str_keys['id']})")
     end
 
     it 'does not formats id when show_ids is false' do
       options = {:details => {:label => 'Id', :key => :id,  :id => 1}, :context => {:show_ids => false}}
-      formatter.format(reference_str_keys, options)
+      _(formatter.format(reference_str_keys, options))
                .must_equal("#{reference_str_keys['name']}")
     end
 
     it 'formats details' do
       options = { :details => { :label => _('url'), :key => :url } }
-      formatter.format(reference_str_keys, options)
+      _(formatter.format(reference_str_keys, options))
                .must_equal("Server (url: #{reference_str_keys['url']})")
     end
 
     it 'formats multiple details' do
       options = { :details => [{ :label => _('url'), :key => :url },
                                { :label => _('desc'), :key => :desc }] }
-      formatter.format(reference_str_keys, options)
+      _(formatter.format(reference_str_keys, options))
                .must_equal("Server (url: #{reference_str_keys['url']}, desc: #{reference_str_keys['desc']})")
     end
 
@@ -152,7 +152,7 @@ describe HammerCLIForeman::Output::Formatters::ReferenceFormatter do
                  :details => [{ :label => _('url'), :key => :url },
                               { :label => _('desc'), :key => :desc },
                               { :label => _('Id'), :key => :id }] }
-      formatter.format(reference_str_keys, options)
+      _(formatter.format(reference_str_keys, options))
                .must_equal("Server (url: #{reference_str_keys['url']}, desc: #{reference_str_keys['desc']}, Id: #{reference_str_keys['id']})")
     end
   end

data/test/unit/param_filters_test.rb

@@ -24,11 +24,11 @@ describe HammerCLIForeman::ParamsFlattener do
   }
 
   it "flatten params" do
-    flattener.filter([param1, param2, hash_param2]).must_equal [param1, param2, hash_param2, param1, hash_param, param1, param2]
+    _(flattener.filter([param1, param2, hash_param2])).must_equal [param1, param2, hash_param2, param1, hash_param, param1, param2]
   end
 
   it "returns empty array for no params" do
-    flattener.filter([]).must_equal []
+    _(flattener.filter([])).must_equal []
   end
 
 end
@@ -63,15 +63,15 @@ describe HammerCLIForeman::IdParamsFilter do
     }
 
     it "returns only required params ending with _id" do
-      required_filter.for_action(action).must_equal required_params
+      _(required_filter.for_action(action)).must_equal required_params
     end
 
     it "returns only ending with _id when :only_required is set to false" do
-      nonrequired_filter.for_action(action).must_equal (required_params+id_params)
+      _(nonrequired_filter.for_action(action)).must_equal (required_params+id_params)
     end
 
     it "returns required params by default" do
-      filter.for_action(action).must_equal required_params
+      _(filter.for_action(action)).must_equal required_params
     end
 
     context "with hash params" do
@@ -81,15 +81,15 @@ describe HammerCLIForeman::IdParamsFilter do
       }
 
       it "finds params inside a hash" do
-        filter.for_action(action).must_equal required_params
+        _(filter.for_action(action)).must_equal required_params
       end
 
       it "returns only required params ending with _id" do
-        required_filter.for_action(action).must_equal required_params
+        _(required_filter.for_action(action)).must_equal required_params
       end
 
       it "returns only ending with _id when :only_required is set to false" do
-        nonrequired_filter.for_action(action).must_equal (required_params+id_params)
+        _(nonrequired_filter.for_action(action)).must_equal (required_params+id_params)
       end
 
     end
@@ -128,15 +128,15 @@ describe HammerCLIForeman::IdArrayParamsFilter do
     }
 
     it "returns only required params ending with _ids" do
-      required_filter.for_action(action).must_equal required_params
+      _(required_filter.for_action(action)).must_equal required_params
     end
 
     it "returns only ending with _ids when :only_required is set to false" do
-      nonrequired_filter.for_action(action).must_equal (required_params+id_params)
+      _(nonrequired_filter.for_action(action)).must_equal (required_params+id_params)
     end
 
     it "returns required params by default" do
-      filter.for_action(action).must_equal required_params
+      _(filter.for_action(action)).must_equal required_params
     end
 
     context "with hash params" do
@@ -146,15 +146,15 @@ describe HammerCLIForeman::IdArrayParamsFilter do
       }
 
       it "finds params inside a hash" do
-        filter.for_action(action).must_equal required_params
+        _(filter.for_action(action)).must_equal required_params
       end
 
       it "returns only required params ending with _ids" do
-        required_filter.for_action(action).must_equal required_params
+        _(required_filter.for_action(action)).must_equal required_params
       end
 
       it "returns only ending with _ids when :only_required is set to false" do
-        nonrequired_filter.for_action(action).must_equal (required_params+id_params)
+        _(nonrequired_filter.for_action(action)).must_equal (required_params+id_params)
       end
 
     end
@@ -188,19 +188,19 @@ describe HammerCLIForeman::ParamsNameFilter do
     it "finds parameter by name" do
       action = stub(:params => ([the_param]+other_params))
       filter = HammerCLIForeman::ParamsNameFilter.new("xxx")
-      filter.for_action(action).must_equal [the_param]
+      _(filter.for_action(action)).must_equal [the_param]
     end
 
     it "finds parameter by name nested in another hash parameter" do
       action = stub(:params => ([hash_param]+other_params))
       filter = HammerCLIForeman::ParamsNameFilter.new("xxx")
-      filter.for_action(action).must_equal [the_param]
+      _(filter.for_action(action)).must_equal [the_param]
     end
 
     it "returns empty array when the parameter is not found" do
       action = stub(:params => ([the_param]+other_params))
       filter = HammerCLIForeman::ParamsNameFilter.new("???")
-      filter.for_action(action).must_equal []
+      _(filter.for_action(action)).must_equal []
     end
 
   end

data/test/unit/partition_table_test.rb

@@ -119,8 +119,8 @@ describe HammerCLIForeman::PartitionTable do
       # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
-    with_params ["--id=83", "--new-name=ptable","--file=~/table.sh", "--os-family=RedHat"] do
-      it_should_call_action :update, {'id' => '83', 'name' => 'ptable', 'ptable' => {'name' => 'ptable', 'layout' => 'FILE_CONTENT', 'os_family' => 'RedHat'}}
+    with_params ['--id=83', '--new-name=ptable', '--file=~/table.sh', '--os-family=RedHat'] do
+      it_should_call_action :update, { 'id' => '83', 'ptable' => { 'name' => 'ptable', 'layout' => 'FILE_CONTENT', 'os_family' => 'RedHat' } }
     end
 
   end

data/test/unit/role_test.rb

@@ -77,8 +77,8 @@ describe HammerCLIForeman::Role do
       it_should_accept "name and new name", ["--name=role", "--new-name=role2"]
     end
 
-    with_params ["--id=1", "--new-name=role2"] do
-      it_should_call_action :update, {'id' => '1', 'name' => 'role2', 'role' => {'name' => 'role2'}}
+    with_params ['--id=1', '--new-name=role2'] do
+      it_should_call_action :update, { 'id' => '1', 'role' => { 'name' => 'role2' } }
     end
 
   end

data/test/unit/sessions_test.rb

@@ -12,9 +12,8 @@ describe HammerCLIForeman do
         Dir.mktmpdir do |dir|
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session = HammerCLIForeman::Sessions.get('http://example.com')
-          session.id.must_be_nil
-          session.auth_type.must_be_nil
-          session.user_name.must_be_nil
+          _(session.id).must_be_nil
+          _(session.user_name).must_be_nil
         end
       end
 
@@ -24,8 +23,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session_content = {
             :id => '3040b0f04c3a35a499e6837278904d48',
-            :user_name => 'admin',
-            :auth_type => 'basic_auth'
+            :user_name => 'admin'
           }
           session_path = "#{dir}/http_example.com"
           File.open(session_path,"w") do |f|
@@ -34,9 +32,8 @@ describe HammerCLIForeman do
           File.chmod(0600, session_path)
 
           session = HammerCLIForeman::Sessions.get('http://example.com')
-          session.id.must_equal '3040b0f04c3a35a499e6837278904d48'
-          session.auth_type.must_equal 'basic_auth'
-          session.user_name.must_equal 'admin'
+          _(session.id).must_equal '3040b0f04c3a35a499e6837278904d48'
+          _(session.user_name).must_equal 'admin'
         end
       end
 
@@ -46,7 +43,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           FileUtils.rm_rf(dir)
           HammerCLIForeman::Sessions.get('http://example.com')
-          File.exist?(dir).must_equal true
+          _(File.exist?(dir)).must_equal true
         end
       end
 
@@ -56,7 +53,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           FileUtils.chmod(0777, dir)
           _, err = capture_io { HammerCLIForeman::Sessions.get('http://example.com') }
-          err.must_equal("Invalid permissions for #{dir}: 40777, expected 40700.\n" \
+          _(err).must_equal("Invalid permissions for #{dir}: 40777, expected 40700.\n" \
               "Using session auth with invalid permissions on session files is not recommended.\n")
         end
       end
@@ -67,8 +64,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session_content = {
             :id => '3040b0f04c3a35a499e6837278904d48',
-            :user_name => 'admin',
-            :auth_type => 'basic_auth'
+            :user_name => 'admin'
           }
           session_path = "#{dir}/http_example.com"
           File.open(session_path,"w") do |f|
@@ -77,44 +73,44 @@ describe HammerCLIForeman do
           File.chmod(0666, session_path)
 
           _, err = capture_io { HammerCLIForeman::Sessions.get('http://example.com') }
-          err.must_equal("Invalid permissions for #{session_path}: 100666, expected 100600.\n" \
+          _(err).must_equal("Invalid permissions for #{session_path}: 100666, expected 100600.\n" \
               "Using session auth with invalid permissions on session files is not recommended.\n")
         end
       end
 
       it 'should fail if sessions are not enabled' do
         HammerCLI::Settings.expects(:get).with(:foreman, :use_sessions).returns(false)
-        e = proc { HammerCLIForeman::Sessions.get('http://example.com')}.must_raise RuntimeError
-        e.message.must_equal "Sessions are not enabled, please check your Hammer settings."
+        e = _(proc { HammerCLIForeman::Sessions.get('http://example.com')}).must_raise RuntimeError
+        _(e.message).must_equal "Sessions are not enabled, please check your Hammer settings."
       end
     end
 
     describe "#enabled?" do
       it 'tests sessions are enabled' do
         HammerCLI::Settings.expects(:get).with(:foreman, :use_sessions).returns(true)
-        HammerCLIForeman::Sessions.enabled?.must_equal true
+        _(HammerCLIForeman::Sessions.enabled?).must_equal true
       end
 
       it 'tests sessions are disabled' do
         HammerCLI::Settings.expects(:get).with(:foreman, :use_sessions).returns(false)
-        HammerCLIForeman::Sessions.enabled?.must_equal false
+        _(HammerCLIForeman::Sessions.enabled?).must_equal false
       end
     end
 
     describe "#session_file" do
       it 'should return file path for session' do
         file_path = HammerCLIForeman::Sessions.session_file('http://example.com')
-        file_path.must_equal(File.join(HammerCLIForeman::Sessions.storage, 'http_example.com'))
+        _(file_path).must_equal(File.join(HammerCLIForeman::Sessions.storage, 'http_example.com'))
       end
 
       it 'should handle invalid url' do
-        e = proc { HammerCLIForeman::Sessions.session_file('/\/')}.must_raise RuntimeError
-        e.message.must_equal "The url (/\\/) is not a valid URL. Session can not be created."
+        e = _(proc { HammerCLIForeman::Sessions.session_file('/\/')}).must_raise RuntimeError
+        _(e.message).must_equal "The url (/\\/) is not a valid URL. Session can not be created."
       end
 
       it 'should handle empty url' do
-        e = proc { HammerCLIForeman::Sessions.session_file('')}.must_raise RuntimeError
-        e.message.must_equal "The url is empty. Session can not be created."
+        e = _(proc { HammerCLIForeman::Sessions.session_file('')}).must_raise RuntimeError
+        _(e.message).must_equal "The url is empty. Session can not be created."
       end
     end
   end
@@ -124,14 +120,12 @@ describe HammerCLIForeman do
       Tempfile.create('session') do |f|
         session = HammerCLIForeman::Session.new(f.path)
         session.id = '3040b0f04c3a35a499e6837278904d48'
-        session.auth_type = 'basic_auth'
         session.user_name = 'admin'
         session.store
 
         session = HammerCLIForeman::Session.new(f.path)
-        session.id.must_equal '3040b0f04c3a35a499e6837278904d48'
-        session.auth_type.must_equal 'basic_auth'
-        session.user_name.must_equal 'admin'
+        _(session.id).must_equal '3040b0f04c3a35a499e6837278904d48'
+        _(session.user_name).must_equal 'admin'
       end
     end
 
@@ -139,7 +133,7 @@ describe HammerCLIForeman do
       Tempfile.create('session') do |f|
         session = HammerCLIForeman::Session.new(f.path)
         session.store
-        File.stat(f.path).mode.to_s(8).must_equal '100600'
+        _(File.stat(f.path).mode.to_s(8)).must_equal '100600'
       end
     end
 
@@ -150,10 +144,9 @@ describe HammerCLIForeman do
         _, err = capture_io do
           session = HammerCLIForeman::Session.new(f.path)
           session.id = nil
-          session.auth_type = nil
           session.user_name = nil
         end
-        err.must_equal("Invalid session data. Resetting the session.\n")
+        _(err).must_equal("Invalid session data. Resetting the session.\n")
       end
     end
 
@@ -162,14 +155,12 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = '3040b0f04c3a35a499e6837278904d48'
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
           session.destroy
 
           session = HammerCLIForeman::Session.new(f.path)
-          session.id.must_be_nil
-          session.auth_type.must_equal 'basic_auth'
-          session.user_name.must_equal 'admin'
+          _(session.id).must_be_nil
+          _(session.user_name).must_equal 'admin'
         end
       end
     end
@@ -179,9 +170,8 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = nil
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
-          session.valid?.must_equal false
+          _(session.valid?).must_equal false
         end
       end
 
@@ -189,9 +179,8 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = '34252624635723572357234'
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
-          session.valid?.must_equal true
+          _(session.valid?).must_equal true
         end
       end
     end