hammer_cli_foreman 3.6.0 → 3.8.0

data/test/unit/domain_test.rb

@@ -7,19 +7,19 @@ describe HammerCLIForeman::Domain do
 
   include CommandTestHelper
 
-  context "ListCommand" do
+  describe "ListCommand" do
     before do
       ResourceMocks.mock_action_call(:domains, :index, [])
     end
 
     let(:cmd) { HammerCLIForeman::Domain::ListCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
     end
 
-    context "output" do
+    describe "output" do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
@@ -29,17 +29,17 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
 
     let(:cmd) { HammerCLIForeman::Domain::InfoCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=arch"]
       # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Created at", "Updated at"]
@@ -50,11 +50,11 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "CreateCommand" do
+  describe "CreateCommand" do
 
     let(:cmd) { HammerCLIForeman::Domain::CreateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name, fullname", ["--name=domain", "--description=full_domain_name"]
       # it_should_fail_with "name missing", ["--full-name=full_domain_name"]
       # TODO: temporarily disabled, parameters are checked in the api
@@ -63,11 +63,11 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "DeleteCommand" do
+  describe "DeleteCommand" do
 
     let(:cmd) { HammerCLIForeman::Domain::DeleteCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name", ["--name=domain"]
       it_should_accept "id", ["--id=1"]
       # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -76,11 +76,11 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "UpdateCommand" do
+  describe "UpdateCommand" do
 
     let(:cmd) { HammerCLIForeman::Domain::UpdateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name", ["--name=domain", "--new-name=domain2", "--description=full_domain_name"]
       it_should_accept "id", ["--id=1", "--new-name=domain2", "--description=full_domain_name"]
       # it_should_fail_with "no params", []
@@ -91,7 +91,7 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "SetParameterCommand" do
+  describe "SetParameterCommand" do
 
     before :each do
       ResourceMocks.parameters_index
@@ -99,7 +99,7 @@ describe HammerCLIForeman::Domain do
 
     let(:cmd) { HammerCLIForeman::Domain::SetParameterCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name, value and domain name", ["--name=name", "--value=val", "--domain=name"]
       it_should_accept "name, value and domain id", ["--name=name", "--value=val", "--domain-id=1"]
       it_should_accept "name, value, parameter type and domain name",
@@ -113,11 +113,11 @@ describe HammerCLIForeman::Domain do
   end
 
 
-  context "DeleteParameterCommand" do
+  describe "DeleteParameterCommand" do
 
     let(:cmd) { HammerCLIForeman::Domain::DeleteParameterCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name and domain name", ["--name=param", "--domain=name"]
       it_should_accept "name and domain id", ["--name=param", "--domain-id=1"]
 

data/test/unit/exception_handler_test.rb

@@ -125,7 +125,7 @@ describe HammerCLIForeman::ExceptionHandler do
     _(err_code).must_equal HammerCLI::EX_SOFTWARE
   end
 
-  context "redirects" do
+  describe "redirects" do
     let(:response) { HammerCLIForeman.foreman_api.api.send(:create_fake_response, 301, '', 'GET', 'http://foreman.example.com/api/architectures') }
     it "should detect http to https redirection error" do
       response.headers[:location] = 'https://foreman.example.com/api/architectures'

data/test/unit/external_usergroup_test.rb

@@ -7,19 +7,19 @@ require 'hammer_cli_foreman/usergroup'
 describe HammerCLIForeman::ExternalUsergroup do
   include CommandTestHelper
 
-  context "ListCommand" do
+  describe "ListCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::ListCommand.new("", ctx) }
 
     before :each do
       ResourceMocks.mock_action_call(:external_usergroups, :index, [])
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "user group name", ["--user-group=cr"]
       it_should_accept "user group id", ["--user-group-id=1"]
     end
 
-    context "output" do
+    describe "output" do
       let(:expected_record_count) { count_records(cmd.resource.call(:index, :usergroup_id => 1)) }
 
       with_params ["--user-group-id=1"] do
@@ -31,19 +31,19 @@ describe HammerCLIForeman::ExternalUsergroup do
     end
   end
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::InfoCommand.new("", ctx) }
 
     before :each do
       ResourceMocks.mock_action_call(:external_usergroups, :show, {})
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "user group name and external usergroup's id", ["--user-group=cr", "--id=1"]
       it_should_accept "user group id and external usergroup's id", ["--user-group-id=1", "--id=1"]
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--user-group-id=1", "--id=1"] do
         it_should_print_column "Name"
         it_should_print_column "Auth source"
@@ -51,19 +51,19 @@ describe HammerCLIForeman::ExternalUsergroup do
     end
   end
 
-  context "RefreshExternalUsergroupsCommand" do
+  describe "RefreshExternalUsergroupsCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::RefreshExternalUsergroupsCommand.new("", ctx) }
 
     before :each do
       ResourceMocks.mock_action_call(:external_usergroups, :refresh, [])
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "user group name and external usergroup's id", ["--user-group=cr", "--id=1"]
       it_should_accept "user group id and external usergroup's id", ["--user-group-id=1", "--id=1"]
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--user-group-id=1", "--id=1"] do
         it_should_print_column "Name"
         it_should_print_column "Auth source"
@@ -71,30 +71,30 @@ describe HammerCLIForeman::ExternalUsergroup do
     end
   end
 
-  context "CreateCommand" do
+  describe "CreateCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::CreateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       # it_should_fail_with "no name", ["--auth-source-id=1", "--user-group-id=1"]
       it_should_accept "all required params", ["--name=aabbcc123", "--auth-source-id=1", "--user-group-id=1"]
     end
   end
 
 
-  context "DeleteCommand" do
+  describe "DeleteCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::DeleteCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id and user group's id", ["--id=1", "--user-group-id=1"]
       it_should_accept "id and user group's name", ["--id=1", "--user-group=ec2"]
     end
   end
 
 
-  context "UpdateCommand" do
+  describe "UpdateCommand" do
     let(:cmd) { HammerCLIForeman::ExternalUsergroup::UpdateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id and user group's id", ["--id=1", "--user-group-id=1"]
       it_should_accept "id and user group's name", ["--id=1", "--user-group=ec2"]
       it_should_accept "all available params", ["--id=1", "--name=img", "--auth-source-id=1", "--user-group-id=1"]

data/test/unit/fact_test.rb

@@ -7,7 +7,7 @@ describe HammerCLIForeman::Fact do
 
   include CommandTestHelper
 
-  context "ListCommand" do
+  describe "ListCommand" do
 
     let(:cmd) { HammerCLIForeman::Fact::ListCommand.new("", ctx) }
 
@@ -15,12 +15,12 @@ describe HammerCLIForeman::Fact do
       ResourceMocks.facts_index
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
     end
 
-    context "output" do
+    describe "output" do
       it_should_print_column "Host"
       it_should_print_column "Fact"
       it_should_print_column "Value"

data/test/unit/filter_test.rb

@@ -8,7 +8,7 @@ describe HammerCLIForeman::Filter do
   include CommandTestHelper
 
 
-  context "ListCommand" do
+  describe "ListCommand" do
 
     let(:cmd) { HammerCLIForeman::Filter::ListCommand.new("", ctx) }
 
@@ -16,12 +16,12 @@ describe HammerCLIForeman::Filter do
       ResourceMocks.mock_action_call(:filters, :index, [])
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
     end
 
-    context "output" do
+    describe "output" do
       it_should_print_column "Id"
       it_should_print_column "Resource type"
       it_should_print_column "Search"
@@ -31,7 +31,7 @@ describe HammerCLIForeman::Filter do
 
   end
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
 
     let(:cmd) { HammerCLIForeman::Filter::InfoCommand.new("", ctx) }
 
@@ -39,11 +39,11 @@ describe HammerCLIForeman::Filter do
       ResourceMocks.mock_action_call(:filters, :show, {})
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id", ["--id=1"]
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_column "Id"
@@ -57,7 +57,7 @@ describe HammerCLIForeman::Filter do
     end
   end
 
-  context "CreateCommand" do
+  describe "CreateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::CreateCommand.new("", ctx) }
 
     before do
@@ -65,7 +65,7 @@ describe HammerCLIForeman::Filter do
       cmd.stubs(:option_override).returns(false)
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "role id and permission ids", ["--role-id=1", "--permission-ids=1,2"]
       it_should_accept "role name and permission ids", ["--role=role", "--permission-ids=1,2"]
       it_should_accept "role name, permission ids, search", ["--role=role", "--permission-ids=1,2", "--search='name=*'"]
@@ -73,16 +73,16 @@ describe HammerCLIForeman::Filter do
 
   end
 
-  context "DeleteCommand" do
+  describe "DeleteCommand" do
 
     let(:cmd) { HammerCLIForeman::Filter::DeleteCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id", ["--id=1"]
     end
   end
 
-  context "UpdateCommand" do
+  describe "UpdateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::UpdateCommand.new("", ctx) }
 
     before do
@@ -90,7 +90,7 @@ describe HammerCLIForeman::Filter do
       cmd.stubs(:option_override).returns(false)
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id, role id and permission ids", ["--id=1", "--role-id=1", "--permission-ids=1,2"]
       it_should_accept "id, role name and permission ids", ["--id=1", "--role=role", "--permission-ids=1,2"]
       it_should_accept "id, role name, permission ids, search", ["--id=1", "--role=role", "--permission-ids=1,2", "--search='name=*'"]
@@ -99,7 +99,7 @@ describe HammerCLIForeman::Filter do
   end
 
 
-  context "AvailablePermissionsCommand" do
+  describe "AvailablePermissionsCommand" do
 
     let(:cmd) { HammerCLIForeman::Filter::AvailablePermissionsCommand.new("", ctx) }
 
@@ -107,12 +107,12 @@ describe HammerCLIForeman::Filter do
       ResourceMocks.mock_action_call(:permissions, :index, [])
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept "pagination options", ["--page=2", "--per-page=10"]
     end
 
-    context "output" do
+    describe "output" do
       it_should_print_column "Id"
       it_should_print_column "Name"
       it_should_print_column "Resource"
@@ -120,7 +120,7 @@ describe HammerCLIForeman::Filter do
 
   end
 
-  context "AvailableResourcesCommand" do
+  describe "AvailableResourcesCommand" do
 
     let(:cmd) { HammerCLIForeman::Filter::AvailableResourcesCommand.new("", ctx) }
 
@@ -128,11 +128,11 @@ describe HammerCLIForeman::Filter do
       ResourceMocks.mock_action_call(:permissions, :resource_types, [])
     end
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
     end
 
-    context "output" do
+    describe "output" do
       it_should_print_column "Name"
     end
 

data/test/unit/helpers/command.rb

@@ -6,7 +6,31 @@ class IdResolverTestProxy
 
   def initialize(original_resolver)
     @original_resolver = original_resolver
-    define_id_finders
+  end
+
+  def self.for_resolver(original_resolver)
+    resolver = Class.new(IdResolverTestProxy) do |cls|
+      original_resolver.api.resources.each do |resource|
+        method_name = "#{resource.singular_name}_id"
+        cls.define_method(method_name) do |options|
+          value = options[HammerCLI.option_accessor_name("id")]
+          value ||= HammerCLI::NilValue if searchables(resource).any? do |s|
+            options[HammerCLI.option_accessor_name(s.name)] == HammerCLI::NilValue
+          end
+          value ||= 1 if searchables(resource).any? do |s|
+            !options[HammerCLI.option_accessor_name(s.name)].nil?
+          end
+          value
+        end
+
+        method_name = "#{resource.singular_name}_ids"
+        cls.define_method(method_name) do |options|
+          options["option_#{resource.singular_name}_ids"].nil? ? nil : [1]
+        end
+      end
+    end
+
+    resolver.new(original_resolver)
   end
 
   def scoped_options(scope, options, mode = nil)
@@ -16,30 +40,6 @@ class IdResolverTestProxy
   def searchables(resource)
     @original_resolver.searchables(resource)
   end
-
-  protected
-
-  def define_id_finders
-    @original_resolver.api.resources.each do |resource|
-      method_name = "#{resource.singular_name}_id"
-      self.class.send(:define_method, method_name) do |options|
-        value = options[HammerCLI.option_accessor_name("id")]
-        value ||= HammerCLI::NilValue if searchables(resource).any? do |s|
-          options[HammerCLI.option_accessor_name(s.name)] == HammerCLI::NilValue
-        end
-        value ||= 1 if searchables(resource).any? do |s|
-          !options[HammerCLI.option_accessor_name(s.name)].nil?
-        end
-        value
-      end
-
-      method_name = "#{resource.singular_name}_ids"
-      self.class.send(:define_method, method_name) do |options|
-        options["option_#{resource.singular_name}_ids"].nil? ? nil : [1]
-      end
-    end
-  end
-
 end
 
 
@@ -50,7 +50,7 @@ module CommandTestHelper
 
     base.before :each do
       resolver = cmd.resolver
-      cmd.stubs(:resolver).returns(IdResolverTestProxy.new(resolver))
+      cmd.stubs(:resolver).returns(IdResolverTestProxy.for_resolver(resolver))
     end
   end
 
@@ -61,9 +61,9 @@ module CommandTestHelper
   module ClassMethods
 
     def with_params(params, &block)
-      context "with params "+params.to_s do
+      describe "with params "+params.to_s do
         let(:with_params) { params }
-        self.instance_eval &block
+        self.instance_eval(&block)
       end
     end
 
@@ -95,7 +95,7 @@ module CommandTestHelper
 
     def it_should_accept(message, arguments=[])
       it "should accept " + message.to_s do
-        out, err = capture_io do
+        _out, _err = capture_io do
           _(cmd.run(arguments)).must_equal HammerCLI::EX_OK
         end
       end
@@ -105,7 +105,7 @@ module CommandTestHelper
       it "should output '" + message.to_s + "'" do
         arguments ||= respond_to?(:with_params) ? with_params : []
         cmd.stubs(:context).returns(ctx.update(:adapter => adapter))
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
         _(out).must_include message
@@ -117,11 +117,11 @@ module CommandTestHelper
         arguments ||= respond_to?(:with_params) ? with_params : []
 
         cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
 
-        _(out.split("\n")[0]).must_match /.*##{column_name}#.*/
+        _(out.split("\n")[0]).must_match(/.*##{column_name}#.*/)
       end
     end
 
@@ -137,7 +137,7 @@ module CommandTestHelper
 
         cmd.stubs(:context).returns(ctx.update(:adapter => :test))
         count ||= expected_record_count rescue 0
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
         _(out.split(/\n/).length).must_equal count+1 # plus 1 for line with column headers

data/test/unit/helpers/resource_disabled.rb

@@ -4,7 +4,7 @@ module ResourceDisabled
 
   def it_should_fail_when_disabled
     arguments = @with_params ? @with_params.dup : []
-    context "resource disabled" do
+    describe "resource disabled" do
 
       it "should return error" do
         cmd.class.resource.stubs(:call).raises(RestClient::ResourceNotFound)