hammer_cli_foreman 2.5.2 → 3.0.0

data/test/functional/hostgroup/create_test.rb

@@ -68,25 +68,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --domain d1))
       end
 
-      it 'allows environment id' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment-id 1))
-      end
-
-      it 'allows environment name' do
-        api_expects(:environments, :index) do |p|
-          p[:search] = "name = \"env1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment env1))
-      end
-
       it 'allows location ids' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['location_ids'] == ['1','4'] &&
@@ -203,104 +184,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --partition-table pt1))
       end
 
-      it 'allows puppet ca proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_ca_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy-id 1))
-      end
-
-      it 'allows puppet ca proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_ca_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy sp1))
-      end
-
-      it 'allows puppet class ids' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-class-ids 1,2))
-      end
-
-      it 'allows puppet class names' do
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] = "name = \"pc1\" or name = \"pc2\""
-        end.returns(index_response('puppetclasses' => [
-          {'id' => 1, 'name' => 'pc1'},
-          {'id' => 2, 'name' => 'pc2'}
-        ]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-classes pc1,pc2))
-      end
-
-      it 'allows puppet class names that exceeds entries_per_page' do
-        search_objects = []
-        response_objects = []
-        ids = []
-        names = []
-        1100.times.with_object('pc').each do |id, name|
-          next_name = "\"#{name}#{id}\""
-          search_objects << "name = #{next_name}"
-          response_objects << { 'id' => id, 'name' => next_name }
-          ids << id
-          names << next_name
-        end
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 1 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(
-          index_response('puppetclasses' => response_objects[0...1000]))
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 2 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(index_response('puppetclasses' => response_objects[1000...1100]))
-
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['name'] == 'hg1' &&
-            p['hostgroup']['puppetclass_ids'] == ids
-        end
-
-        run_cmd(%w[hostgroup create --name hg1 --puppet-classes] << names.join(',').tr('"', ''))
-      end
-
-      it 'allows puppet proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy-id 1))
-      end
-
-      it 'allows puppet proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy sp1))
-      end
-
       it 'allows realm id' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['realm_id'] == 1 &&

data/test/functional/hostgroup/update_test.rb

@@ -68,25 +68,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --domain d1))
       end
 
-      it 'allows environment id' do
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --environment-id 1))
-      end
-
-      it 'allows environment name' do
-        api_expects(:environments, :index) do |p|
-          p[:search] = "name = \"env1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --environment env1))
-      end
-
       it 'allows location ids' do
         api_expects(:hostgroups, :update) do |p|
           p['hostgroup']['location_ids'] == ['1','4'] &&
@@ -201,66 +182,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --partition-table pt1))
       end
 
-      it 'allows puppet ca proxy id' do
-        api_expects(:hostgroups, :update).with_params({
-          :id => '1',
-          :hostgroup => { :puppet_ca_proxy_id => 1 }
-        })
-        run_cmd(%w(hostgroup update --id 1 --puppet-ca-proxy-id 1))
-      end
-
-      it 'allows puppet ca proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppet_ca_proxy_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-ca-proxy sp1))
-      end
-
-      it 'allows puppet class ids' do
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-class-ids 1,2))
-      end
-
-      it 'allows puppet class names' do
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] = "name = \"pc1\" or name = \"pc2\""
-        end.returns(index_response('puppetclasses' => [
-          {'id' => 1, 'name' => 'pc1'},
-          {'id' => 2, 'name' => 'pc2'}
-        ]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-classes pc1,pc2))
-      end
-
-      it 'allows puppet proxy id' do
-        api_expects(:hostgroups, :update).with_params({
-          :id => '1',
-          :hostgroup => { :puppet_proxy_id => 1 }
-        })
-        run_cmd(%w(hostgroup update --id 1 --puppet-proxy-id 1))
-      end
-
-      it 'allows puppet proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppet_proxy_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-proxy sp1))
-      end
-
       it 'allows realm id' do
         api_expects(:hostgroups, :update) do |p|
           p['hostgroup']['realm_id'] == 1 &&

data/test/functional/location_test.rb

@@ -208,7 +208,6 @@ describe 'info' do
         provisioning_templates: [],
         domains: [],
         realms: [],
-        environments: [],
         hostgroups: [],
         organizations: [],
         parameters: []
@@ -242,8 +241,6 @@ describe 'info' do
                                  '',
                                  'Realms:',
                                  '',
-                                 'Environments:',
-                                 '',
                                  'Hostgroups:',
                                  '',
                                  'Parameters:',

data/test/functional/mail_notification_test.rb

@@ -26,7 +26,7 @@ describe 'mail_notification' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -39,6 +39,8 @@ describe 'mail_notification' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:mail_notifications, :index, 'List mail notifications').returns(@mail_notifications)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/model_test.rb

@@ -26,7 +26,7 @@ describe 'model' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -39,6 +39,8 @@ describe 'model' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:models, :index, 'List models').returns(@models)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/operating_system_test.rb

@@ -27,7 +27,7 @@ describe 'operating_system' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -40,6 +40,8 @@ describe 'operating_system' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:operatingsystems, :index, 'List operating systems').returns(@operating_system)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/settings_test.rb

@@ -32,7 +32,7 @@ describe 'Settings' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -45,9 +45,9 @@ describe 'Settings' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
-      api_expects(:settings, :index, 'List').with_params(
-        'page' => 1, 'per_page' => 1000
-      ).returns(index_response([setting]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
+      api_expects(:settings, :index, 'List settings').returns(setting)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })
       _(result.exit_code).must_equal HammerCLI::EX_OK

data/test/functional/template_test.rb

@@ -140,45 +140,13 @@ describe 'template' do
       @cmd = %w(template combination)
     end
 
-    it 'should create new combination with warning' do
-      params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
-      expected_result = success_result("Template combination created.\n")
-      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment[-id] instead\n"
-      api_expects(:template_combinations, :create, 'Create template combination') do |params|
-        params['provisioning_template_id'] == 10 &&
-          params['hostgroup_id'] == 1 &&
-          params['environment_id'] == 1 &&
-          params['template_combination'] == {'environment_id' => 1, 'hostgroup_id' => 1}
-      end
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(expected_result, result)
-    end
-
     it 'should create new combination' do
-      params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--puppet-environment-id=1']
+      params = ['create','--provisioning-template-id=10', '--hostgroup-id=1']
       expected_result = success_result("Template combination created.\n")
       api_expects(:template_combinations, :create, 'Create template combination') do |params|
         params['provisioning_template_id'] == 10 &&
           params['hostgroup_id'] == 1 &&
-          params['environment_id'] == 1 &&
-          params['template_combination'] == {'environment_id' => 1, 'hostgroup_id' => 1}
-      end
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(expected_result, result)
-    end
-
-    it 'should update combination with warning' do
-      params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
-      expected_result = success_result("Template combination updated.\n")
-      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment[-id] instead\n"
-      api_expects(:template_combinations, :update, 'Update template combination') do |params|
-        params['id'] == '3' &&
-          params['provisioning_template_id'] == 10 &&
-          params['hostgroup_id'] == 1 &&
-          params['environment_id'] == 1 &&
-          params['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
+          params['template_combination'] == {'hostgroup_id' => 1}
       end
 
       result = run_cmd(@cmd + params)
@@ -186,14 +154,13 @@ describe 'template' do
     end
 
     it 'should update combination' do
-      params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1', '--puppet-environment-id=1']
+      params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1']
       expected_result = success_result("Template combination updated.\n")
       api_expects(:template_combinations, :update, 'Update template combination') do |params|
         params['id'] == '3' &&
           params['provisioning_template_id'] == 10 &&
           params['hostgroup_id'] == 1 &&
-          params['environment_id'] == 1 &&
-          params['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
+          params['template_combination'] == { 'hostgroup_id' => 1 }
       end
 
       result = run_cmd(@cmd + params)

data/test/functional/usergroup_test.rb

@@ -27,7 +27,7 @@ describe 'user-group' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -40,6 +40,8 @@ describe 'user-group' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:usergroups, :index, 'List user groups').returns(@user_groups)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

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/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