hammer_cli_foreman 2.4.0 → 3.1.0

data/test/unit/apipie_resource_mock.rb

@@ -19,15 +19,6 @@ module ResourceMocks
     end
   end
 
-  def self.smart_class_parameters_index
-    ResourceMocks.mock_action_call(:smart_class_parameters, :index,
-      { "results" => [ { 'parameter' => 'config', 'id' => '1'} ] })
-  end
-
-  def self.smart_class_parameters_show
-    ResourceMocks.mock_action_call(:smart_class_parameters, :show, { 'smart_class_parameter' => { 'override_value_order' => '', 'environments' => [] }})
-  end
-
   def self.smart_variables_index
     ResourceMocks.mock_action_call(:smart_variables, :index,
       { "results" => [ { 'variable' => 'var', 'id' => '1'} ] })
@@ -107,8 +98,6 @@ module ResourceMocks
     ResourceMocks.mock_action_call(:hosts, :show, {
       "ip" => "192.168.122.51",
       "ip6" => nil,
-      "environment_id" => 1,
-      "environment_name" => "production",
       "last_report" => "2016-10-24 12:06:31 UTC",
       "mac" => "52:54:00:ce:b2:b9",
       "realm_id" => nil,
@@ -150,26 +139,11 @@ module ResourceMocks
       "organization_name" => nil,
       "location_id" => nil,
       "location_name" => nil,
-      "puppet_status" => 0,
       "model_name" => "KVM",
       "configuration_status" => 0,
       "configuration_status_label" => "No reports",
       "name" => "foreman.example.com",
       "id" => 1,
-      "puppet_proxy_id" => 1,
-      "puppet_proxy_name" => "foreman.example.com",
-      "puppet_ca_proxy_id" => 1,
-      "puppet_ca_proxy_name" => "foreman.example.com",
-      "puppet_proxy" => {
-        "name" => "foreman.example.com",
-        "id" => 1,
-        "url" => "https://foreman.example.com:9090"
-      },
-      "puppet_ca_proxy" => {
-        "name" => "foreman.example.com",
-        "id" => 1,
-        "url" => "https://foreman.example.com:9090"
-      },
       "hostgroup_name" => nil,
       "hostgroup_title" => nil,
       "parameters" => [],
@@ -193,10 +167,7 @@ module ResourceMocks
         "primary" => false,
         "provision" => false,
         "type" => "interface"
-      }],
-      "puppetclasses" => [],
-      "config_groups" => [],
-      "all_puppetclasses" => []
+      }]
     })
   end
 
@@ -335,13 +306,4 @@ module ResourceMocks
       "value" => "random value",
     }])
   end
-
-  def self.config_groups_index
-    ResourceMocks.mock_action_call(:config_groups, :index, [{
-      id: 15,
-      name: "test config group",
-      puppetclasses: [ { name: "My puppetclass" } ]
-    }])
-  end
-
 end

data/test/unit/architecture_test.rb

@@ -17,8 +17,8 @@ describe HammerCLIForeman::Architecture do
     context "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context "output" do
@@ -39,8 +39,8 @@ describe HammerCLIForeman::Architecture do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=arch"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
@@ -61,8 +61,8 @@ describe HammerCLIForeman::Architecture do
 
     context "parameters" do
       it_should_accept "name", ["--name=arch"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--name=arch --organization-id=1]
+      it_should_accept 'location', %w[--name=arch --location-id=1]
       # it_should_fail_with "name missing", []
       # TODO: temporarily disabled, parameters are checked in the api
     end
@@ -77,8 +77,8 @@ describe HammerCLIForeman::Architecture do
     context "parameters" do
       it_should_accept "name", ["--name=arch"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
@@ -92,8 +92,8 @@ describe HammerCLIForeman::Architecture do
     context "parameters" do
       it_should_accept "name", ["--name=arch", "--new-name=arch2"]
       it_should_accept "id", ["--id=1", "--new-name=arch2"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --new-name=arch2 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --new-name=arch2 --location-id=1]
       # it_should_fail_with "no params", [] # TODO: temporarily disabled, parameters are checked in the id resolver
       # it_should_fail_with "name or id missing", ["--new-name=arch2"] # TODO: temporarily disabled, parameters are checked in the id resolver
     end

data/test/unit/bookmark_test.rb

@@ -17,8 +17,8 @@ describe HammerCLIForeman::Bookmark do
 
     context 'parameters' do
       it_should_accept 'no arguments'
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context 'output' do
@@ -41,8 +41,8 @@ describe HammerCLIForeman::Bookmark do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=active']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
     context 'output' do
@@ -63,11 +63,9 @@ describe HammerCLIForeman::Bookmark do
     let(:cmd) { HammerCLIForeman::Bookmark::CreateCommand.new('', ctx) }
 
     context 'parameters' do
-      it_should_accept 'name, public, controller, query',
-                       ['--name=active', '--public=1', '--controller=hosts',
+      it_should_accept 'name, public, controller, query, organization, location',
+                       ['--name=active', '--public=1', '--controller=hosts', '--organization-id=1', '--location-id=1',
                         '--query=last_report > "35 minutes ago" and (status.applied > 0 or status.restarted > 0)']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
     end
 
   end
@@ -78,8 +76,8 @@ describe HammerCLIForeman::Bookmark do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=active']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 
@@ -89,11 +87,9 @@ describe HammerCLIForeman::Bookmark do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=active']
-      it_should_accept 'name, public, controller, query',
-                       ['--name=active', '--public=1', '--controller=hosts',
+      it_should_accept 'name, public, controller, query, organization, location',
+                       ['--name=active', '--public=1', '--controller=hosts', '--organization-id=1', '--location-id=1',
                         '--query=last_report > "35 minutes ago" and (status.applied > 0 or status.restarted > 0)']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
     end
   end
 end

data/test/unit/commands_test.rb

@@ -183,8 +183,7 @@ describe HammerCLIForeman::Command do
     out, err = capture_io do
       _(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-id, --location, --location-title.\n"
   end
 
   it "ignores error on attempt to search of parameters that are not required" do

data/test/unit/compute_profile_test.rb

@@ -17,8 +17,8 @@ describe HammerCLIForeman::ComputeProfile do
 
     context 'parameters' do
       it_should_accept 'no arguments'
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context 'output' do
@@ -36,8 +36,8 @@ describe HammerCLIForeman::ComputeProfile do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=test']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
     context 'output' do
@@ -57,8 +57,8 @@ describe HammerCLIForeman::ComputeProfile do
 
     context 'parameters' do
       it_should_accept 'name', ['--name=test']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--name=test --organization-id=1]
+      it_should_accept 'location', %w[--name=test --location-id=1]
     end
 
   end
@@ -69,8 +69,8 @@ describe HammerCLIForeman::ComputeProfile do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=test']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 
@@ -80,8 +80,8 @@ describe HammerCLIForeman::ComputeProfile do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=test']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 end

data/test/unit/config_report_test.rb

@@ -25,6 +25,7 @@ describe HammerCLIForeman::ConfigReport do
       it_should_print_n_records
       it_should_print_column "Id"
       it_should_print_column "Host"
+      it_should_print_column "Origin"
       it_should_print_column "Last report"
       it_should_print_column "Applied"
       it_should_print_column "Restarted"

data/test/unit/helpers/command.rb

@@ -17,14 +17,6 @@ class IdResolverTestProxy
     @original_resolver.searchables(resource)
   end
 
-  def puppet_environment_id(options)
-    environment_id(options)
-  end
-
-  def puppet_environment_ids(options)
-    environment_ids(options)
-  end
-
   protected
 
   def define_id_finders

data/test/unit/host_test.rb

@@ -45,8 +45,7 @@ describe HammerCLIForeman::Host do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Organization", "Location"]
-        it_should_print_columns ["Host Group", "Compute Resource", "Compute Profile", "Puppet Environment"]
-        it_should_print_columns ["Puppet CA Proxy", "Puppet Master Proxy", "Cert name"]
+        it_should_print_columns ["Host Group", "Compute Resource", "Compute Profile"]
         it_should_print_columns ["Managed", "Status", "Installed at", "Last report"]
         it_should_print_columns ["Network", "Network interfaces", "Operating system", "Parameters", "All parameters", "Additional info"]
       end
@@ -106,32 +105,6 @@ describe HammerCLIForeman::Host do
     end
   end
 
-
-  context "PuppetClassesCommand" do
-    before do
-      ResourceMocks.mock_action_call(:puppetclasses, :index, {})
-    end
-
-    let(:cmd) { HammerCLIForeman::Host::PuppetClassesCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "host", ["--host=name=my5name.mydomain.net"]
-      it_should_accept "host-id", ["--host-id=1"]
-      # it_should_fail_with "host or host-id missing", []
-      # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-    context "output" do
-
-      with_params ["--host=my5name.mydomain.net"] do
-        it_should_print_column "Id"
-        it_should_print_column "Name"
-      end
-    end
-
-  end
-
-
   context "ConfigReportsCommand" do
     before do
       ResourceMocks.mock_action_call(:config_reports, :index, [])
@@ -186,29 +159,25 @@ describe HammerCLIForeman::Host do
 
     context "parameters" do
       taxonomies = ["--organization-id=1", "--location-id=1"]
-      it_should_accept "name, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      it_should_accept "name, architecture_id, domain_id, operatingsystem_id and more",
+          ["--name=host", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build", "--interface=primary=true,provision=true"] + taxonomies
       it_should_fail_with "name or id missing",
-          ["--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
-      it_should_fail_with "environment_id missing",
-          ["--name=host", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "architecture_id missing",
-          ["--name=host", "--environment-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "domain_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
-      it_should_fail_with "puppet_proxy_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--architecture-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "operatingsystem_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--architecture-id=1", "--domain-id=1", "--interface=primary=true,provision=true"]
       it_should_accept "only hostgroup name", ["--hostgroup=example", "--name=host", "--interface=primary=true,provision=true"] + taxonomies
       it_should_accept "only hostgroup ID", ["--hostgroup-id=1", "--name=host", "--interface=primary=true,provision=true"] + taxonomies
 
-      with_params ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      with_params ["--name=host", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build", "--interface=primary=true,provision=true"] do
         it_should_call_action_and_test_params(:create) { |par| par["host"]["managed"] == true }
         it_should_call_action_and_test_params(:create) { |par| par["host"]["build"] == true }
@@ -240,16 +209,16 @@ describe HammerCLIForeman::Host do
 
     context "parameters" do
       it_should_accept "name", ["--name=host", "--new-name=host2"]
-      it_should_accept "id and more", ["--id=1", "--new-name=host2", "--environment-id=1", "--architecture-id=1",
-            "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      it_should_accept "id and more", ["--id=1", "--new-name=host2", "--architecture-id=1",
+            "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build"]
       # it_should_fail_with "no params", []
       # it_should_fail_with "name or id missing", ["--new-name=host2"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
 
-      with_params ["--id=1", "--puppet-proxy-id=1"] do
+      with_params ["--id=1"] do
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("managed") != true }
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("build") != true }
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("enabled") != true }
@@ -350,22 +319,6 @@ describe HammerCLIForeman::Host do
     end
   end
 
-  context "SCParamsCommand" do
-
-    before :each do
-      ResourceMocks.smart_class_parameters_index
-    end
-
-    let(:cmd) { HammerCLIForeman::Host::SCParamsCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "host", ["--host=host"]
-      it_should_accept "host-id", ["--host-id=1"]
-      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RebuildConfigCommand" do
 
     let(:cmd) { HammerCLIForeman::Host::RebuildConfigCommand.new("", ctx) }

data/test/unit/hostgroup_test.rb

@@ -24,7 +24,7 @@ describe HammerCLIForeman::Hostgroup do
 
       it_should_print_n_records
       it_should_print_columns ["Id", "Name", "Title", "Operating System"]
-      it_should_print_columns ["Puppet Environment", "Model"]
+      it_should_print_columns ["Model"]
     end
 
   end
@@ -42,8 +42,6 @@ describe HammerCLIForeman::Hostgroup do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Title"]
-        it_should_print_columns ["Puppet Environment", "Puppetclasses", "Parent"]
-        it_should_print_columns ["Puppet CA Proxy", "Puppet Master Proxy"]
         it_should_print_columns ["Parameters", "Description"]
         it_should_print_columns ["Network", "Operating system"]
       end
@@ -67,9 +65,9 @@ describe HammerCLIForeman::Hostgroup do
     let(:cmd) { HammerCLIForeman::Hostgroup::CreateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, parent_id, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--name=hostgroup", "--parent-id=1", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1",
-            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids=1,2', '--root-pass=foreman']
+      it_should_accept "name, parent_id, architecture_id, domain_id, operatingsystem_id and more",
+          ["--name=hostgroup", "--parent-id=1", "--architecture-id=1", "--domain-id=1",
+            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--root-password=foreman']
       # it_should_fail_with "name or id missing",
       #    ["--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1"]
       # TODO: temporarily disabled, parameters are checked in the api
@@ -81,9 +79,9 @@ describe HammerCLIForeman::Hostgroup do
     let(:cmd) { HammerCLIForeman::Hostgroup::UpdateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, parent_id, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--id=1 --name=hostgroup2 --title=default/hostgroup2", "--parent-id=1", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1",
-            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids=1,2', '--root-pass=foreman']
+      it_should_accept "name, parent_id, architecture_id, domain_id, operatingsystem_id and more",
+          ["--id=1 --name=hostgroup2 --title=default/hostgroup2", "--parent-id=1", "--architecture-id=1", "--domain-id=1",
+            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--root-password=foreman']
       # it_should_fail_with "no params", []
       # it_should_fail_with "id missing", ["--name=host2"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -123,23 +121,6 @@ describe HammerCLIForeman::Hostgroup do
 
   end
 
-
-  context "SCParamsCommand" do
-
-    before :each do
-      ResourceMocks.smart_class_parameters_index
-    end
-
-    let(:cmd) { HammerCLIForeman::Hostgroup::SCParamsCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "hostgroup", ["--hostgroup=hostgroup"]
-      it_should_accept "hostgroup-id", ["--hostgroup-id=1"]
-      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RebuildConfigCommand" do
 
     let(:cmd) { HammerCLIForeman::Hostgroup::RebuildConfigCommand.new("", ctx) }

data/test/unit/id_resolver_test.rb

@@ -213,34 +213,6 @@ describe HammerCLIForeman::IdResolver do
       end
     end
 
-    describe 'searching for puppetclasses' do
-      before do
-        ResourceMocks.mock_action_call(:puppetclasses, :index, {
-          'apache' => [
-            { 'id' => 70, 'name' => 'apache::dev', 'created_at' => '2015-01-27T07:24:57.134Z', 'updated_at' => '2015-03-05T17:27:54.282Z' },
-            { 'id' => 27, 'name' => 'apache::mod::authnz_ldap', 'created_at' => '2015-01-27T07:24:56.378Z','updated_at' => '2015-01-27T07:24:56.378Z' }
-          ],
-          'git' => [
-            { 'id' => 85, 'name' => 'git::params', 'created_at' => '2015-01-27T07:24:57.306Z', 'updated_at' => '2015-01-27T07:24:57.306Z' }
-          ]
-        })
-      end
-
-      it "returns ids from options" do
-        result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ['apache::dev']})
-        assert_equal [4, 5], result
-      end
-
-      it "returns ids of the classes" do
-        class_names = ['apache::mod::authnz_ldap', 'git::params', 'apache::dev']
-        assert_equal [70, 27, 85], resolver.puppetclass_ids('option_names' => class_names)
-      end
-
-      it 'returns empty array for empty class array' do
-        assert_equal [], resolver.puppetclass_ids('option_names' => [])
-      end
-    end
-
     describe "searching for multiple resources" do
       it "returns ids from options" do
         result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ["some", "names"]})

data/test/unit/mail_notification_test.rb

@@ -17,8 +17,8 @@ describe HammerCLIForeman::MailNotification do
 
     context 'parameters' do
       it_should_accept 'no arguments'
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context 'output' do
@@ -36,8 +36,8 @@ describe HammerCLIForeman::MailNotification do
     context 'parameters' do
       it_should_accept 'id', ['--id=1']
       it_should_accept 'name', ['--name=test']
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
     context 'output' do