hammer_cli_foreman 2.1.2 → 2.2.0

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

data/test/unit/host_test.rb

@@ -76,7 +76,7 @@ describe HammerCLIForeman::Host do
 
         it "should output status" do
           cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-          proc { cmd.run(with_params) }.must_output "#Status#Power#\n#No reports#running#\n"
+          _(proc { cmd.run(with_params) }).must_output "#Status#Power#\n#No reports#running#\n"
         end
       end
     end
@@ -148,7 +148,7 @@ describe HammerCLIForeman::Host do
       with_params ["--id=1"] do
         it "should inform that puppet was triggered" do
           cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-          proc { cmd.run(with_params) }.must_output "Puppet run triggered\n"
+          _(proc { cmd.run(with_params) }).must_output "Puppet run triggered\n"
         end
       end
     end

data/test/unit/id_resolver_test.rb

@@ -14,7 +14,7 @@ describe HammerCLIForeman::IdResolver do
 
   describe "scoped options" do
     it "returns empty hash when there are no options" do
-      resolver.scoped_options("scope", {}).must_equal({})
+      _(resolver.scoped_options("scope", {})).must_equal({})
     end
 
     it "unscopes options" do
@@ -29,7 +29,7 @@ describe HammerCLIForeman::IdResolver do
         "option_name" => "ACME",
         "option_a" => :value
       }
-      resolver.scoped_options("organization", scoped).must_equal(unscoped)
+      _(resolver.scoped_options("organization", scoped)).must_equal(unscoped)
     end
 
     it "clears old values" do
@@ -43,7 +43,7 @@ describe HammerCLIForeman::IdResolver do
         "option_id" => 2,
         "option_a" => :value
       }
-      resolver.scoped_options("organization", scoped).must_equal(unscoped)
+      _(resolver.scoped_options("organization", scoped)).must_equal(unscoped)
     end
 
     let(:scoped_multi) {{
@@ -63,7 +63,7 @@ describe HammerCLIForeman::IdResolver do
         "option_name" => "ACME",
         "option_a" => :value
       }
-      resolver.scoped_options("organization", scoped_multi, :single).must_equal(unscoped)
+      _(resolver.scoped_options("organization", scoped_multi, :single)).must_equal(unscoped)
     end
 
     it "unscopes the right options in multi mode" do
@@ -75,7 +75,7 @@ describe HammerCLIForeman::IdResolver do
         "option_names" => "Corp",
         "option_a" => :value
       }
-      resolver.scoped_options("organization", scoped_multi, :multi).must_equal(unscoped)
+      _(resolver.scoped_options("organization", scoped_multi, :multi)).must_equal(unscoped)
     end
 
     it "does not change the original options" do
@@ -87,7 +87,7 @@ describe HammerCLIForeman::IdResolver do
       }
       scoped_original = scoped.dup
       resolver.scoped_options("organization", scoped)
-      scoped.must_equal(scoped_original)
+      _(scoped).must_equal(scoped_original)
     end
 
   end
@@ -102,19 +102,19 @@ describe HammerCLIForeman::IdResolver do
     it "must define methods for all resources" do
       expected_method_names = api.resources.map(&:singular_name).collect{|r| "#{r}_id"}
       missing_methods = expected_method_names - resolver.methods.map(&:to_s)
-      missing_methods.must_equal []
+      _(missing_methods).must_equal []
     end
 
     describe "when no search options are found" do
       let(:resolver_run) { proc { resolver.comment_id({"option_unknown" => "value"}) } }
 
       it "raises exception" do
-        err = resolver_run.must_raise HammerCLIForeman::MissingSearchOptions
+        err = _(resolver_run).must_raise HammerCLIForeman::MissingSearchOptions
       end
 
       it "builds correct error message" do
-        err = resolver_run.must_raise HammerCLIForeman::MissingSearchOptions
-        err.message.must_equal "Missing options to search comment."
+        err = _(resolver_run).must_raise HammerCLIForeman::MissingSearchOptions
+        _(err.message).must_equal "Missing options to search comment."
       end
     end
 
@@ -124,15 +124,15 @@ describe HammerCLIForeman::IdResolver do
       it "raises exception when no resource is found" do
         ResourceMocks.mock_action_call(:users, :index, index_response([]))
 
-        err = resolver_run.must_raise HammerCLIForeman::ResolverError
-        err.message.must_equal "user not found."
+        err = _(resolver_run).must_raise HammerCLIForeman::ResolverError
+        _(err.message).must_equal "user not found."
       end
 
       it "raises exception when multiple resources are found" do
         ResourceMocks.mock_action_call(:users, :index, index_response([john, jane]))
 
-        err = resolver_run.must_raise HammerCLIForeman::ResolverError
-        err.message.must_equal "Found more than one user."
+        err = _(resolver_run).must_raise HammerCLIForeman::ResolverError
+        _(err.message).must_equal "Found more than one user."
       end
 
       it "calls index action with appropriate search params" do
@@ -148,17 +148,17 @@ describe HammerCLIForeman::IdResolver do
       it "uses option id when it's available" do
         ResourceMocks.mock_action_call(:users, :index, [])
 
-        resolver.user_id({"option_id" => 83, "option_name" => "John Doe"}).must_equal 83
+        _(resolver.user_id({"option_id" => 83, "option_name" => "John Doe"})).must_equal 83
       end
 
       it "returns NIL when the search name is NIL" do
-        resolver.user_id({"option_name" => HammerCLI::NilValue}).must_equal HammerCLI::NilValue
+        _(resolver.user_id({"option_name" => HammerCLI::NilValue})).must_equal HammerCLI::NilValue
       end
 
       it "returns id of the resource" do
         ResourceMocks.mock_action_call(:users, :index, index_response([john]))
 
-        resolver_run.call.must_equal john_id
+        _(resolver_run.call).must_equal john_id
       end
 
     end
@@ -170,16 +170,16 @@ describe HammerCLIForeman::IdResolver do
         ResourceMocks.mock_action_call(:posts, :index, index_response([]))
         ResourceMocks.mock_action_call(:users, :index, index_response([]))
 
-        err = resolver_run.must_raise HammerCLIForeman::ResolverError
-        err.message.must_equal "user not found."
+        err = _(resolver_run).must_raise HammerCLIForeman::ResolverError
+        _(err.message).must_equal "user not found."
       end
 
       it "raises exception when multiple resources are found" do
         ResourceMocks.mock_action_call(:posts, :index, index_response([]))
         ResourceMocks.mock_action_call(:users, :index, index_response([john, jane]))
 
-        err = resolver_run.must_raise HammerCLIForeman::ResolverError
-        err.message.must_equal "Found more than one user."
+        err = _(resolver_run).must_raise HammerCLIForeman::ResolverError
+        _(err.message).must_equal "Found more than one user."
       end
 
       it "calls index action with appropriate search params" do
@@ -209,7 +209,7 @@ describe HammerCLIForeman::IdResolver do
             {"id" => 22, "name" => "User 22"}
           ]
         ))
-        resolver_run.call.must_equal 11
+        _(resolver_run.call).must_equal 11
       end
     end
 
@@ -288,7 +288,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "returns NilValue when the search name is NilValue" do
-        resolver.user_ids({"option_names" => HammerCLI::NilValue}).must_equal HammerCLI::NilValue
+        _(resolver.user_ids({"option_names" => HammerCLI::NilValue})).must_equal HammerCLI::NilValue
       end
     end
   end

data/test/unit/option_builders_test.rb

@@ -6,20 +6,20 @@ describe HammerCLIForeman::BuildParams do
   let(:params) { HammerCLIForeman::BuildParams.new }
 
   it "creates empty hash by default" do
-    params.to_hash.must_equal( {} )
+    _(params.to_hash).must_equal( {} )
   end
 
   it "can be prefonfigured" do
     preconfigured_params = HammerCLIForeman::BuildParams.new(:expand => {:only => [:a, :b]}, :without => [:c, :d])
     preconfigured_params.expand.including(:c, :d)
-    preconfigured_params.to_hash.must_equal( {:expand => {:only => [:a, :b], :including => [:c, :d]}, :without => [:c, :d]} )
+    _(preconfigured_params.to_hash).must_equal( {:expand => {:only => [:a, :b], :including => [:c, :d]}, :without => [:c, :d]} )
   end
 
   describe "without" do
 
     it "sets :without" do
       params.without(:organization_id, :location_id)
-      params.to_hash.must_equal( {:without => [:organization_id, :location_id]} )
+      _(params.to_hash).must_equal( {:without => [:organization_id, :location_id]} )
     end
 
   end
@@ -28,44 +28,44 @@ describe HammerCLIForeman::BuildParams do
 
     it "can set expand all" do
       params.expand(:all)
-      params.to_hash.must_equal( {:expand => {}} )
+      _(params.to_hash).must_equal( {:expand => {}} )
     end
 
     it "expands all by default" do
       params.expand
-      params.to_hash.must_equal( {:expand => {}} )
+      _(params.to_hash).must_equal( {:expand => {}} )
     end
 
     it "can disable expansion" do
       params.expand(:none)
-      params.to_hash.must_equal( {:expand => {:only => []}} )
+      _(params.to_hash).must_equal( {:expand => {:only => []}} )
     end
 
     describe "except" do
       it "sets except field" do
         params.expand.except(:organizations)
-        params.to_hash.must_equal( {:expand => {:except => [:organizations]}} )
+        _(params.to_hash).must_equal( {:expand => {:except => [:organizations]}} )
       end
     end
 
     describe "including" do
       it "sets including field" do
         params.expand.including(:organizations)
-        params.to_hash.must_equal( {:expand => {:including => [:organizations]}} )
+        _(params.to_hash).must_equal( {:expand => {:including => [:organizations]}} )
       end
     end
 
     describe "only" do
       it "sets only field" do
         params.expand.only(:organizations)
-        params.to_hash.must_equal( {:expand => {:only => [:organizations]}} )
+        _(params.to_hash).must_equal( {:expand => {:only => [:organizations]}} )
       end
     end
 
     describe "primary" do
       it "sets primary field" do
         params.expand.primary(:organizations)
-        params.to_hash.must_equal( {:expand => {:primary => :organizations}} )
+        _(params.to_hash).must_equal( {:expand => {:primary => :organizations}} )
       end
     end
 
@@ -103,7 +103,7 @@ describe HammerCLIForeman::BuilderConfigurator do
     let(:action) { resource.action(:index)}
 
     it "adds no option builder" do
-      result_classes.must_equal []
+      _(result_classes).must_equal []
     end
   end
 
@@ -112,7 +112,7 @@ describe HammerCLIForeman::BuilderConfigurator do
     let(:action) { resource.action(:show)}
 
     it "adds searchable options builder" do
-      resource_names(builders_by_class(HammerCLIForeman::SearchablesOptionBuilder)).must_equal [:users]
+      _(resource_names(builders_by_class(HammerCLIForeman::SearchablesOptionBuilder))).must_equal [:users]
     end
   end
 
@@ -122,13 +122,13 @@ describe HammerCLIForeman::BuilderConfigurator do
     let(:action) { resource.action(:show)}
 
     it "adds searchable options builder" do
-      resource_names(builders_by_class(HammerCLIForeman::SearchablesOptionBuilder)).must_equal [:posts]
+      _(resource_names(builders_by_class(HammerCLIForeman::SearchablesOptionBuilder))).must_equal [:posts]
     end
 
     it "adds dependent searchable option builders" do
       resources = resource_names(builders_by_class(HammerCLIForeman::DependentSearchablesOptionBuilder)).sort
       expected = [:users]
-      resources.must_equal expected.sort
+      _(resources).must_equal expected.sort
     end
 
   end
@@ -162,7 +162,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
     builder.stubs(:build).returns(options)
 
     container.builders = [builder, builder]
-    container.build.must_equal options+options
+    _(container.build).must_equal options+options
   end
 
   it "passes build parameters to contained builders" do
@@ -183,13 +183,13 @@ describe HammerCLIForeman::ForemanOptionBuilder do
         HammerCLIForeman::SearchablesOptionBuilder.new(api.resource(:users), FakeSearchables.new(["aaa", "bbb"]))
       ]
       @build_options = {:expand => {:primary => false}}
-      option_switches.must_equal []
+      _(option_switches).must_equal []
     end
 
     it "can add custom searchable builder" do
       container.builders = []
       @build_options = {:expand => {:primary => :users}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--name"],
         ["--label"]
       ]
@@ -200,7 +200,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
         HammerCLIForeman::SearchablesOptionBuilder.new(api.resource(:posts), FakeSearchables.new(["aaa", "bbb"]))
       ]
       @build_options = {:expand => {:primary => :users}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--name"],
         ["--label"]
       ]
@@ -220,7 +220,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
 
     it "does not filter searchable builders by default" do
       @build_options = {:expand => {}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--user"],
         ["--user-label"],
         ["--user-id"],
@@ -232,7 +232,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
 
     it "adds dependent searchable builders on explicit requirement" do
       @build_options = {:expand => {:including => [:posts, :comments]}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--user"],
         ["--user-label"],
         ["--user-id"],
@@ -247,7 +247,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
 
     it "filters dependent searchable builders on explicit requirement" do
       @build_options = {:expand => {:except => [:users]}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--post"],
         ["--post-label"],
         ["--post-id"]
@@ -256,7 +256,7 @@ describe HammerCLIForeman::ForemanOptionBuilder do
 
     it "specifies custom set of dependent searchable builders on explicit requirement" do
       @build_options = {:expand => {:only => [:comments, :users]}}
-      option_switches.must_equal [
+      _(option_switches).must_equal [
         ["--user"],
         ["--user-label"],
         ["--user-id"],
@@ -285,33 +285,33 @@ describe HammerCLIForeman::SearchablesOptionBuilder do
     let(:searchables) { FakeSearchables.new([]) }
 
     it "builds no options for empty searchables" do
-      options.must_equal []
+      _(options).must_equal []
     end
   end
 
   describe "multiple searchables" do
 
     it "builds correct switches" do
-      options.map(&:switches).must_equal [["--name"], ["--label"]]
+      _(options.map(&:switches)).must_equal [["--name"], ["--label"]]
     end
 
     it "builds correct descriptions" do
-      options.map(&:description).must_equal ["Search by name", "Search by label"]
+      _(options.map(&:description)).must_equal ["Search by name", "Search by label"]
     end
 
     it "builds correct types" do
-      options.map(&:type).must_equal ["NAME", "LABEL"]
+      _(options.map(&:type)).must_equal ["NAME", "LABEL"]
     end
 
     it "builds correct attribute readers" do
-      options.map(&:read_method).must_equal [
+      _(options.map(&:read_method)).must_equal [
         "option_name",
         "option_label"
       ]
     end
 
     it "none of the options is required" do
-      options.any?{|opt| opt.required? }.must_equal false
+      _(options.any?{|opt| opt.required? }).must_equal false
     end
   end
 end
@@ -335,14 +335,14 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     let(:searchables) { FakeSearchables.new([]) }
 
     it "builds only id options" do
-      options.map(&:switches).must_equal [["--user-id"]]
+      _(options.map(&:switches)).must_equal [["--user-id"]]
     end
   end
 
   describe "multiple searchables" do
 
     it "creates correct switches" do
-      options.map(&:switches).must_equal [
+      _(options.map(&:switches)).must_equal [
         ["--user"],       # first option does not have the suffix
         ["--user-label"], # other options with suffixes
         ["--user-uuid"],
@@ -351,7 +351,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "creates correct option types" do
-      options.map(&:type).must_equal [
+      _(options.map(&:type)).must_equal [
         "USER_NAME",
         "USER_LABEL",
         "USER_UUID",
@@ -360,7 +360,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "creates correct descriptions" do
-      options.map(&:description).must_equal [
+      _(options.map(&:description)).must_equal [
         "Search by name",
         "Search by label",
         "Search by uuid",
@@ -369,7 +369,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "creates correct attribute readers" do
-      options.map(&:read_method).must_equal [
+      _(options.map(&:read_method)).must_equal [
         "option_user_name",
         "option_user_label",
         "option_user_uuid",
@@ -378,7 +378,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "none of the options is required" do
-      options.any?{|opt| opt.required? }.must_equal false
+      _(options.any?{|opt| opt.required? }).must_equal false
     end
   end
 
@@ -388,7 +388,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     let(:builder_params) { {:resource_mapping => {:user => :usr}} }
 
     it "renames options" do
-      options.map(&:switches).must_equal [
+      _(options.map(&:switches)).must_equal [
         ["--usr"],       # first option does not have the suffix
         ["--usr-label"], # other options with suffixes
         ["--usr-uuid"],
@@ -397,7 +397,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "renames option types" do
-      options.map(&:type).must_equal [
+      _(options.map(&:type)).must_equal [
         "USR_NAME",
         "USR_LABEL",
         "USR_UUID",
@@ -406,7 +406,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
 
     it "keeps option accessor the same" do
-      options.map(&:attribute_name).must_equal [
+      _(options.map(&:attribute_name)).must_equal [
         "option_user_name",
         "option_user_label",
         "option_user_uuid",
@@ -418,7 +418,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
   describe "resources with id parameter in show action" do
 
     it "uses descriptions from the action" do
-      options.map(&:description).must_equal [
+      _(options.map(&:description)).must_equal [
         "Search by name",
         "Search by label",
         "Search by uuid",
@@ -443,32 +443,32 @@ describe HammerCLIForeman::SearchablesUpdateOptionBuilder do
     let(:searchables) { FakeSearchables.new([]) }
 
     it "builds no options for empty searchables" do
-      options.must_equal []
+      _(options).must_equal []
     end
   end
 
   describe "multiple searchables" do
 
     it "builds correct switches" do
-      options.map(&:switches).must_equal [["--new-label"]]
+      _(options.map(&:switches)).must_equal [["--new-label"]]
     end
 
     it "builds correct descriptions" do
-      options.map(&:description).must_equal [" "]
+      _(options.map(&:description)).must_equal [" "]
     end
 
     it "builds correct types" do
-      options.map(&:type).must_equal ["NEW_LABEL"]
+      _(options.map(&:type)).must_equal ["NEW_LABEL"]
     end
 
     it "builds correct attribute readers" do
-      options.map(&:read_method).must_equal [
+      _(options.map(&:read_method)).must_equal [
         "option_new_label"
       ]
     end
 
     it "none of the options is required" do
-      options.any?{|opt| opt.required? }.must_equal false
+      _(options.any?{|opt| opt.required? }).must_equal false
     end
   end
 
@@ -487,7 +487,7 @@ describe HammerCLIForeman::SearchablesUpdateOptionBuilder do
     end
 
     it "uses descriptions from the action" do
-      options.map(&:description).must_equal ["DESC"]
+      _(options.map(&:description)).must_equal ["DESC"]
     end
   end
 end
@@ -504,11 +504,11 @@ describe HammerCLIForeman::IdOptionBuilder do
 
   describe "resources with parameter :id in show action" do
     it "creates options --id" do
-      options.map(&:switches).must_equal [["--id"]]
+      _(options.map(&:switches)).must_equal [["--id"]]
     end
 
     it "uses description from the :id param" do
-      options.map(&:description).must_equal ["DESC"]
+      _(options.map(&:description)).must_equal ["DESC"]
     end
   end
 
@@ -522,11 +522,11 @@ describe HammerCLIForeman::IdOptionBuilder do
     end
 
     it "creates options --id" do
-      options.map(&:switches).must_equal [["--id"]]
+      _(options.map(&:switches)).must_equal [["--id"]]
     end
 
     it "uses empty description" do
-      options.map(&:description).must_equal [" "]
+      _(options.map(&:description)).must_equal [" "]
     end
   end