hammer_cli_foreman 2.1.1 → 2.3.1

data/test/test_helper.rb

@@ -17,11 +17,14 @@ require "mocha/minitest"
 require 'hammer_cli'
 require 'hammer_cli_foreman/testing/api_expectations'
 
-FOREMAN_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '2.1')
+FOREMAN_VERSION = ENV['TEST_API_VERSION'] || '2.1'
+unless Dir.entries('test/data').include? FOREMAN_VERSION
+  raise StandardError.new "Version is not correct"
+end
 
 include HammerCLIForeman::Testing::APIExpectations
 HammerCLI.context[:api_connection].create('foreman') do
-  api_connection({}, FOREMAN_VERSION)
+  api_connection({}, Gem::Version.new(FOREMAN_VERSION))
 end
 
 require 'hammer_cli_foreman'

data/test/unit/api/interactive_basic_auth_test.rb

@@ -44,11 +44,13 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
 
   context "non-interactive mode" do
     it "doesn't ask for credentials when they're not provided" do
+      HammerCLI.stubs(:interactive?).returns false
       auth = HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, nil)
       auth.expects(:ask_user).never
-
       request.expects(:basic_auth).with(nil, nil)
       auth.authenticate(request, args)
+      HammerCLI.unstub(:interactive?)
+
     end
   end
 

data/test/unit/api/oauth/oauth_authentication_code_grant_test.rb

@@ -23,13 +23,13 @@ describe HammerCLIForeman::Api::Oauth::AuthenticationCodeGrant do
     it 'sets token as nil when all input parameter are missing' do
       auth.stubs(:get_code).returns('code')
       auth.set_token(nil, nil, nil, nil)
-      assert_equal nil, auth.token
+      assert_nil auth.token
     end
 
     it 'sets token as nil when any input parameter is missing' do
       auth.stubs(:get_code).returns('code')
       auth.set_token(nil, params[:oidc_authorization_endpoint], params[:oidc_client_id], params[:oidc_redirect_uri])
-      assert_equal nil, auth.token
+      assert_nil auth.token
     end
   end
 

data/test/unit/api/oauth/oauth_password_grant_test.rb

@@ -22,12 +22,12 @@ describe HammerCLIForeman::Api::Oauth::PasswordGrant do
 
     it 'sets token as nil when all input parameter are missing' do
       auth.set_token(nil, nil, nil, nil)
-      assert_equal nil, auth.token
+      assert_nil auth.token
     end
 
     it 'sets token as nil when any input parameter is missing' do
       auth.set_token(nil, params[:oidc_client_id], params[:username], params[:password])
-      assert_equal nil, auth.token
+      assert_nil auth.token
     end
   end
 

data/test/unit/api_test.rb

@@ -9,17 +9,16 @@ describe HammerCLIForeman do
     let(:expected_resource) { HammerCLIForeman.foreman_resource!(:architectures) }
 
     it "finds resource for params with _id" do
-      HammerCLIForeman.param_to_resource("architecture_id").name.must_equal expected_resource.name
+      _(HammerCLIForeman.param_to_resource("architecture_id").name).must_equal expected_resource.name
     end
 
     it "finds resource for params without _id" do
-      HammerCLIForeman.param_to_resource("architecture").name.must_equal expected_resource.name
+      _(HammerCLIForeman.param_to_resource("architecture").name).must_equal expected_resource.name
     end
 
     it "returns nil for unknown resource" do
-      HammerCLIForeman.param_to_resource("unknown").must_equal nil
+      assert_nil HammerCLIForeman.param_to_resource("unknown")
     end
-
   end
 
 end

data/test/unit/apipie_resource_mock.rb

@@ -308,11 +308,11 @@ module ResourceMocks
     )
   end
 
-  def self.common_parameter_show
-    ResourceMocks.mock_action_call(:common_parameters, :show, {
+  def self.common_parameter_list
+    ResourceMocks.mock_action_call(:common_parameters, :index, [{
       "name" => "my param",
-      "value" => "random value"
-    })
+      "value" => "random value",
+    }])
   end
 
   def self.config_groups_index

data/test/unit/audit_test.rb

@@ -54,6 +54,7 @@ describe HammerCLIForeman::Audit do
         it_should_print_column "Audit type"
         it_should_print_column "Audit record"
         it_should_print_column "Audited changes"
+        it_should_print_column "Request UUID"
       end
     end
   end

data/test/unit/commands_test.rb

@@ -19,16 +19,16 @@ describe HammerCLIForeman do
       ]
 
       set = HammerCLIForeman.collection_to_common_format(old_format)
-      set.must_be_kind_of HammerCLI::Output::RecordCollection
-      set.first.must_equal(kind)
+      _(set).must_be_kind_of HammerCLI::Output::RecordCollection
+      _(set.first).must_equal(kind)
     end
 
     it "should convert common API format" do
       common_format = [ kind ]
 
       set = HammerCLIForeman.collection_to_common_format(common_format)
-      set.must_be_kind_of HammerCLI::Output::RecordCollection
-      set.first.must_equal(kind)
+      _(set).must_be_kind_of HammerCLI::Output::RecordCollection
+      _(set.first).must_equal(kind)
     end
 
     it "should convert new API format" do
@@ -46,12 +46,12 @@ describe HammerCLIForeman do
       }
 
       set = HammerCLIForeman.collection_to_common_format(new_format)
-      set.must_be_kind_of HammerCLI::Output::RecordCollection
-      set.first.must_equal(kind)
+      _(set).must_be_kind_of HammerCLI::Output::RecordCollection
+      _(set.first).must_equal(kind)
     end
 
     it "should rise error on unexpected format" do
-      proc { HammerCLIForeman.collection_to_common_format('unexpected') }.must_raise RuntimeError
+      _(proc { HammerCLIForeman.collection_to_common_format('unexpected') }).must_raise RuntimeError
     end
 
   end
@@ -67,14 +67,14 @@ describe HammerCLIForeman do
       }
 
       rec = HammerCLIForeman.record_to_common_format(old_format)
-      rec.must_equal(arch)
+      _(rec).must_equal(arch)
     end
 
     it "should convert common API format" do
       common_format = arch
 
       rec = HammerCLIForeman.record_to_common_format(common_format)
-      rec.must_equal(arch)
+      _(rec).must_equal(arch)
 
     end
   end
@@ -92,7 +92,7 @@ describe HammerCLIForeman do
       })
       arch = HammerCLIForeman::Architecture::CreateCommand.new("", { :adapter => :csv, :interactive => false })
       out, err = capture_io { arch.run(["--name='i386'"]) }
-      out.must_match("Message,Id,Name\nArchitecture created.,3,i386\n")
+      _(out).must_match("Message,Id,Name\nArchitecture created.,3,i386\n")
     end
   end
 
@@ -111,7 +111,7 @@ describe HammerCLIForeman do
       res.stubs(:get_identifier).returns(1)
       res.stubs(:get_associated_identifier).returns(1)
 
-      res.get_new_ids.sort.must_equal ['1', '2']
+      _(res.get_new_ids.sort).must_equal ['1', '2']
     end
 
     it "should associate resource with new format" do
@@ -128,7 +128,7 @@ describe HammerCLIForeman do
       res.stubs(:get_identifier).returns(1)
       res.stubs(:get_associated_identifier).returns(1)
 
-      res.get_new_ids.sort.must_equal ['1', '2']
+      _(res.get_new_ids.sort).must_equal ['1', '2']
     end
   end
 
@@ -152,7 +152,7 @@ describe HammerCLIForeman do
       end
       comm = DomainOuter::HostsCommand.new("", { :adapter => :csv, :interactive => false })
       out, err = capture_io { comm.run(["--id=5"]) }
-      out.must_equal "Id,Name,Operating System,Host Group,IP,MAC\n2,random-host,,,192.168.100.112,6e:4b:3c:2c:8a:0a\n"
+      _(out).must_equal "Id,Name,Operating System,Host Group,IP,MAC\n2,random-host,,,192.168.100.112,6e:4b:3c:2c:8a:0a\n"
     end
   end
 
@@ -163,7 +163,7 @@ describe HammerCLIForeman::Command do
 
   it "uses foreman option builder" do
     builder = HammerCLIForeman::Command.option_builder
-    builder.class.must_equal HammerCLIForeman::ForemanOptionBuilder
+    _(builder.class).must_equal HammerCLIForeman::ForemanOptionBuilder
   end
 
   it "properly raises error on intentional searching of parameters that are not required" do
@@ -181,9 +181,9 @@ describe HammerCLIForeman::Command do
       )
     )
     out, err = capture_io do
-      com.run(['--location', 'loc']).wont_equal HammerCLI::EX_OK
+      _(com.run(['--location', 'loc'])).wont_equal HammerCLI::EX_OK
     end
-    err.must_equal "Error: Could not find location, please set one of options --location, --location-title, --location-id.\n"
+    _(err).must_equal "Error: Could not find location, please set one of options --location, --location-title, --location-id.\n"
 
   end
 
@@ -205,7 +205,7 @@ describe HammerCLIForeman::Command do
     ResourceMocks.mock_action_call(:domains, :index, [])
 
     out, err = capture_io do
-      com.run([]).must_equal HammerCLI::EX_OK
+      _(com.run([])).must_equal HammerCLI::EX_OK
     end
 
   end
@@ -213,7 +213,7 @@ describe HammerCLIForeman::Command do
   describe "build_options" do
     it "uses build parameters in the block" do
       HammerCLIForeman::Command.build_options do |o|
-        o.class.must_equal HammerCLIForeman::BuildParams
+        _(o.class).must_equal HammerCLIForeman::BuildParams
       end
     end
   end
@@ -228,6 +228,6 @@ describe HammerCLIForeman::ListCommand do
   it 'formats enum values in search fields help' do
     search_field = { name: 'managed', values: [true, false] }
     expected_output = 'Values: true, false'
-    OpenListCommand.new({}).search_field_help_value(search_field).must_equal(expected_output)
+    _(OpenListCommand.new({}).search_field_help_value(search_field)).must_equal(expected_output)
   end
 end

data/test/unit/common_parameter_test.rb

@@ -31,7 +31,7 @@ describe HammerCLIForeman::CommonParameter do
 
   context "SetCommand" do
     before do
-      ResourceMocks.common_parameter_show
+      ResourceMocks.common_parameter_list
     end
 
     let(:cmd) { HammerCLIForeman::CommonParameter::SetCommand.new("", ctx) }

data/test/unit/dependency_resolver_test.rb

@@ -20,7 +20,7 @@ describe HammerCLIForeman::DependencyResolver do
 
     it "returns empty array for an independent resource" do
       resource = api.resource(:users)
-      resolver.resource_dependencies(resource).must_equal []
+      _(resolver.resource_dependencies(resource)).must_equal []
     end
 
     it "returns list of dependent resources" do
@@ -28,7 +28,7 @@ describe HammerCLIForeman::DependencyResolver do
 
       resources = resolver.resource_dependencies(resource).map(&:name).sort_by{ |sym| sym.to_s }
       expected = [:posts, :users]
-      resources.must_equal expected.sort_by{ |sym| sym.to_s }
+      _(resources).must_equal expected.sort_by{ |sym| sym.to_s }
     end
   end
 
@@ -36,14 +36,14 @@ describe HammerCLIForeman::DependencyResolver do
 
     it "returns empty array for an independent action" do
       action = HammerCLIForeman.foreman_resource!(:users).action(:index)
-      resolver.action_dependencies(action).must_equal []
+      _(resolver.action_dependencies(action)).must_equal []
     end
 
     it "returns list of dependent resources" do
       action = HammerCLIForeman.foreman_resource!(:comments).action(:create)
       resources = resolver.action_dependencies(action).map(&:name).sort_by{ |sym| sym.to_s }
       expected = [:posts, :users]
-      resources.must_equal expected.sort_by{|sym| sym.to_s}
+      _(resources).must_equal expected.sort_by{|sym| sym.to_s}
     end
   end
 end

data/test/unit/exception_handler_test.rb

@@ -15,7 +15,7 @@ describe HammerCLIForeman::ExceptionHandler do
     ex = RestClient::UnprocessableEntity.new(response)
     output.expects(:print_error).with(heading, "Network address can't be blank\nNetwork address is invalid\nName can't be blank")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_DATAERR
+    _(err_code).must_equal HammerCLI::EX_DATAERR
   end
 
   it "should print resource errors on unprocessable entity exception" do
@@ -26,21 +26,21 @@ describe HammerCLIForeman::ExceptionHandler do
     ex = RestClient::UnprocessableEntity.new(response)
     output.expects(:print_error).with(heading, "Network address can't be blank\nNetwork address is invalid\nName can't be blank")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_DATAERR
+    _(err_code).must_equal HammerCLI::EX_DATAERR
   end
 
   it "should handle argument error" do
     ex = ArgumentError.new
     output.expects(:print_error).with(heading, ex.message)
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_USAGE
+    _(err_code).must_equal HammerCLI::EX_USAGE
   end
 
   it "should handle forbidden error" do
     ex = RestClient::Forbidden.new
     output.expects(:print_error).with('Forbidden - server refused to process the request.', nil)
     err_code = handler.handle_exception(ex)
-    err_code.must_equal HammerCLI::EX_NOPERM
+    _(err_code).must_equal HammerCLI::EX_NOPERM
   end
 
   it "handles forbidden error with permission details" do
@@ -57,13 +57,13 @@ describe HammerCLIForeman::ExceptionHandler do
     output.expects(:print_error).with(heading, "Error: message")
     MyException = Class.new(Exception)
     err_code = handler.handle_exception(MyException.new('message'), :heading => heading)
-    err_code.must_equal HammerCLI::EX_SOFTWARE
+    _(err_code).must_equal HammerCLI::EX_SOFTWARE
   end
 
   it "should handle unsupported operation error" do
     output.expects(:print_error).with(heading, "message")
     err_code = handler.handle_exception(HammerCLIForeman::OperationNotSupportedError.new('message'), :heading => heading)
-    err_code.must_equal HammerCLI::EX_UNAVAILABLE
+    _(err_code).must_equal HammerCLI::EX_UNAVAILABLE
   end
 
   it "should print resource errors on resource not found exception" do
@@ -75,7 +75,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
     output.expects(:print_error).with(heading, "Resource architecture not found by id '1'")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_NOT_FOUND
+    _(err_code).must_equal HammerCLI::EX_NOT_FOUND
   end
 
   it "should print exception message on resource not found exception without explicit message" do
@@ -85,7 +85,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
     output.expects(:print_error).with(heading, "ResourceNotFound message")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_NOT_FOUND
+    _(err_code).must_equal HammerCLI::EX_NOT_FOUND
   end
 
   it "should print resource errors on internal error exception" do
@@ -97,7 +97,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
     output.expects(:print_error).with(heading, "Some internal exception")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_SOFTWARE
+    _(err_code).must_equal HammerCLI::EX_SOFTWARE
   end
 
   it "should print exception message on internal error exception without formatted message" do
@@ -110,7 +110,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
     output.expects(:print_error).with(heading, "Unformatted\nlines\n")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_SOFTWARE
+    _(err_code).must_equal HammerCLI::EX_SOFTWARE
   end
 
   it "should print exception message on internal error exception with message that is not nested" do
@@ -122,7 +122,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
     output.expects(:print_error).with(heading, "Some internal exception")
     err_code = handler.handle_exception(ex, :heading => heading)
-    err_code.must_equal HammerCLI::EX_SOFTWARE
+    _(err_code).must_equal HammerCLI::EX_SOFTWARE
   end
 
   context "redirects" do
@@ -133,7 +133,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
       output.expects(:print_error).with(heading, "Redirection of API call detected.\nIt seems hammer is configured to use HTTP and the server prefers HTTPS.\nUpdate your server url configuration.\nYou can set 'follow_redirects' to one of :default or :always to enable redirects following.")
       err_code = handler.handle_exception(ex, :heading => heading)
-      err_code.must_equal HammerCLI::EX_CONFIG
+      _(err_code).must_equal HammerCLI::EX_CONFIG
     end
 
     it "should detect redirection error" do
@@ -142,7 +142,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
       output.expects(:print_error).with(heading, "Redirection of API call detected.\nUpdate your server url configuration.\nYou can set 'follow_redirects' to one of :default or :always to enable redirects following.")
       err_code = handler.handle_exception(ex, :heading => heading)
-      err_code.must_equal HammerCLI::EX_CONFIG
+      _(err_code).must_equal HammerCLI::EX_CONFIG
     end
   end
 

data/test/unit/helpers/command.rb

@@ -97,14 +97,14 @@ module CommandTestHelper
 
     def it_should_fail_with(message, arguments=[])
       it "should fail with " + message.to_s do
-        cmd.run(arguments).must_equal HammerCLI::EX_USAGE
+        _(cmd.run(arguments)).must_equal HammerCLI::EX_USAGE
       end
     end
 
     def it_should_accept(message, arguments=[])
       it "should accept " + message.to_s do
         out, err = capture_io do
-          cmd.run(arguments).must_equal HammerCLI::EX_OK
+          _(cmd.run(arguments)).must_equal HammerCLI::EX_OK
         end
       end
     end
@@ -116,7 +116,7 @@ module CommandTestHelper
         out, err = capture_io do
           cmd.run(arguments)
         end
-        out.must_include message
+        _(out).must_include message
       end
     end
 
@@ -129,7 +129,7 @@ module CommandTestHelper
           cmd.run(arguments)
         end
 
-        out.split("\n")[0].must_match /.*##{column_name}#.*/
+        _(out.split("\n")[0]).must_match /.*##{column_name}#.*/
       end
     end
 
@@ -148,7 +148,7 @@ module CommandTestHelper
         out, err = capture_io do
           cmd.run(arguments)
         end
-        out.split(/\n/).length.must_equal count+1 # plus 1 for line with column headers
+        _(out.split(/\n/).length).must_equal count+1 # plus 1 for line with column headers
       end
     end
 

data/test/unit/helpers/resource_disabled.rb

@@ -9,7 +9,7 @@ module ResourceDisabled
       it "should return error" do
         cmd.class.resource.stubs(:call).raises(RestClient::ResourceNotFound)
         arguments = respond_to?(:with_params) ? with_params : []
-        cmd.run(arguments).must_equal HammerCLI::EX_UNAVAILABLE
+        _(cmd.run(arguments)).must_equal HammerCLI::EX_UNAVAILABLE
       end
 
       it "should print error message" do
@@ -17,7 +17,7 @@ module ResourceDisabled
         cmd.stubs(:context).returns(ctx.update(:adapter => :test))
 
         arguments = respond_to?(:with_params) ? with_params : []
-        lambda { cmd.run(arguments) }.must_output "", /.*not support.*/
+        _(lambda { cmd.run(arguments) }).must_output "", /.*not support.*/
       end
     end
   end