hammer_cli_foreman 2.5.1 → 3.2.0

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'] &&
@@ -182,6 +163,17 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --parent parent_hg))
       end
 
+      it 'allows parent hostgroup title' do
+        api_expects(:hostgroups, :index) do |p|
+          p[:search] = 'title = "parent_hg"'
+        end.returns(index_response([{ 'id' => 1 }]))
+        api_expects(:hostgroups, :update) do |p|
+          p['hostgroup']['parent_id'] == 1 &&
+            p['id'] == '1'
+        end
+        run_cmd(%w[hostgroup update --id 1 --parent parent_hg])
+      end
+
       it 'allows partition table id' do
         api_expects(:hostgroups, :update) do |p|
           p['hostgroup']['ptable_id'] == 1 &&
@@ -201,66 +193,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/personal_access_token_test.rb

@@ -37,7 +37,7 @@ describe 'personal_access_token' do
 
     it 'lists all access tokens for a given user' do
       api_expects(:personal_access_tokens, :index, 'List').with_params(
-        'user_id' => 1, 'page' => 1, 'per_page' => 1000
+        'user_id' => '1', 'page' => 1, 'per_page' => 1000
       ).returns(index_response([access_token, active_access_token]))
 
       output = IndexMatcher.new([
@@ -67,7 +67,7 @@ describe 'personal_access_token' do
 
     it 'creates an access token to a given user' do
       api_expects(:personal_access_tokens, :create).with_params(
-        'user_id' => 1, 'personal_access_token' => {
+        'user_id' => '1', 'personal_access_token' => {
           'expires_at' => '01/01/2048', 'name' => 'test'
         }
       ).returns(access_token)
@@ -85,7 +85,7 @@ describe 'personal_access_token' do
 
     it 'shows the personal access token' do
       api_expects(:personal_access_tokens, :show, 'Show PAT').with_params(
-        'id' => '1', 'user_id' => 1
+        'id' => '1', 'user_id' => '1'
       ).returns(access_token)
 
       output = OutputMatcher.new([
@@ -109,7 +109,7 @@ describe 'personal_access_token' do
     let(:params) { ['--id=1', '--user-id=1'] }
     it 'deletes an access token to a given user' do
       api_expects(:personal_access_tokens, :destroy, 'Revoke PAT').with_params(
-        'id' => '1', 'user_id' => 1
+        'id' => '1', 'user_id' => '1'
       ).returns(access_token)
 
       expected_result = success_result(

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

@@ -85,7 +85,6 @@ describe 'template' do
     it "doesn't send snippet flag when --type is undefined" do
       params = ['--id=1', '--locked=true']
 
-      api_expects(:template_kinds, :index, 'Get list of template kinds').returns(index_response([]))
       api_expects(:provisioning_templates, :update, 'Update the template') do |par|
         par['id'] == '1' &&
         par['provisioning_template']['locked'] == true
@@ -99,7 +98,6 @@ describe 'template' do
     it 'updates nothing without template related parameters' do
       params = %w[--id=1 --organization-id=1 --location-id=1]
 
-      api_expects(:template_kinds, :index, 'Get list of template kinds').returns(index_response([]))
       api_expects(:provisioning_templates, :update, 'Update template with no params').returns({})
 
       expected_result = success_result("Nothing to update.\n")
@@ -107,6 +105,48 @@ describe 'template' do
       result = run_cmd(@cmd + params)
       assert_cmd(expected_result, result)
     end
+
+    it 'should update a template' do
+      params = ['--id=1', '--type=snippet']
+
+      expected_result = CommandExpectation.new
+      expected_result.expected_out =
+        ['Provisioning template updated.',
+         ''].join("\n")
+      expected_result.expected_exit_code = HammerCLI::EX_OK
+
+      api_expects(:provisioning_templates, :update, 'Update template with params') do |p|
+        p['id'] == '1' && p['provisioning_template']['snippet'] == true
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should update a template by name' do
+      params = ['--name=tpl', '--type=provision']
+
+      expected_result = CommandExpectation.new
+      expected_result.expected_out =
+        ['Provisioning template updated.',
+         ''].join("\n")
+      expected_result.expected_exit_code = HammerCLI::EX_OK
+
+      api_expects_search(:provisioning_templates, name: 'tpl').returns(
+        index_response([{ 'id' => '1' }])
+      )
+      api_expects_search(:template_kinds, name: 'provision').returns(
+        index_response([{ 'id' => '1' }])
+      )
+      api_expects(:provisioning_templates, :update, 'Update template with params') do |p|
+        p['id'] == '1' &&
+          p['provisioning_template']['snippet'] == false &&
+          p['provisioning_template']['template_kind_id'] == '1'
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
   end
 
   describe 'create' do
@@ -120,65 +160,53 @@ describe 'template' do
       expected_result = CommandExpectation.new
       expected_result.expected_err =
         ['Could not create the provisioning template:',
-         "  Error: unknown template kind",
-         '  ',
-         "  See: 'hammer template create --help'.",
+         '  Error: template_kind not found.',
          ''].join("\n")
-      expected_result.expected_exit_code = HammerCLI::EX_USAGE
+      expected_result.expected_exit_code = HammerCLI::EX_SOFTWARE
 
-      HammerCLIForeman::Template::CreateCommand.any_instance.stubs(:kinds).returns(["PXELinux"])
-
-      api_expects_no_call
+      api_expects_search(:template_kinds, name: 'unknown').returns(
+        index_response([])
+      )
 
       result = run_cmd(@cmd + params)
       assert_cmd(expected_result, result)
     end
-  end
 
-  describe 'combinations' do
-    before do
-      @cmd = %w(template combination)
-    end
+    it 'should create a template' do
+      params = ['--name=tpl', '--file=Gemfile', '--type=provision']
 
-    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}
+      expected_result = CommandExpectation.new
+      expected_result.expected_out =
+        ['Provisioning template created.',
+         ''].join("\n")
+      expected_result.expected_exit_code = HammerCLI::EX_OK
+
+      api_expects_search(:template_kinds, name: 'provision').returns(
+        index_response([{ 'id' => '1' }])
+      )
+      api_expects(:provisioning_templates, :create, 'Create template with params') do |p|
+        p['provisioning_template']['name'] == 'tpl' &&
+          p['provisioning_template']['snippet'] == false &&
+          p['provisioning_template']['template_kind_id'] = '1'
       end
 
       result = run_cmd(@cmd + params)
       assert_cmd(expected_result, result)
     end
+  end
+
+  describe 'combinations' do
+    before do
+      @cmd = %w(template combination)
+    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['provisioning_template_id'] == '10' &&
+          params['hostgroup_id'] == '1' &&
+          params['template_combination'] == { 'hostgroup_id' => '1' }
       end
 
       result = run_cmd(@cmd + params)
@@ -186,14 +214,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['provisioning_template_id'] == '10' &&
+          params['hostgroup_id'] == '1' &&
+          params['template_combination'] == { 'hostgroup_id' => '1' }
       end
 
       result = run_cmd(@cmd + params)

data/test/functional/user_mail_notification_test.rb

@@ -55,9 +55,9 @@ describe 'user_mail_notification' do
       params = ['--user-id=2']
 
       expected_result = common_error_result(
-          @cmd,
-          "Could not find mail_notification, please set one of options --mail-notification, --mail-notification-id.",
-          "Could not add user mail notification"
+        @cmd,
+        'Could not find mail_notification, please set one of options --mail-notification-id, --mail-notification.',
+        'Could not add user mail notification'
       )
 
       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/test_helper.rb

@@ -17,7 +17,7 @@ require "mocha/minitest"
 require 'hammer_cli'
 require 'hammer_cli_foreman/testing/api_expectations'
 
-FOREMAN_VERSION = ENV['TEST_API_VERSION'] || '2.5'
+FOREMAN_VERSION = ENV['TEST_API_VERSION'] || '3.1'
 unless Dir.entries('test/data').include? FOREMAN_VERSION
   raise StandardError.new "Version is not correct"
 end

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