hammer_cli_foreman 2.4.0 → 3.1.0

data/test/unit/model_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
@@ -7,68 +8,67 @@ describe HammerCLIForeman::Model do
 
   include CommandTestHelper
 
-  context "ListCommand" do
+  context 'ListCommand' do
     before do
       ResourceMocks.mock_action_call(:models, :index, [])
     end
 
-    let(:cmd) { HammerCLIForeman::Model::ListCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::ListCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "no arguments"
+    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
+    context 'output' do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
-      it_should_print_column "Name"
-      it_should_print_column "Id"
-      it_should_print_column "Vendor class"
-      it_should_print_column "HW model"
+      it_should_print_column 'Name'
+      it_should_print_column 'Id'
+      it_should_print_column 'Vendor class'
+      it_should_print_column 'HW model'
     end
   end
 
 
-  context "InfoCommand" do
+  context 'InfoCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::InfoCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::InfoCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "id", ["--id=1"]
-      it_should_accept "name", ["--name=model"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+    context 'parameters' do
+      it_should_accept 'id', ['--id=1']
+      it_should_accept 'name', ['--name=model']
+      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
 
-    context "output" do
-      with_params ["--id=1"] do
+    context 'output' do
+      with_params ['--id=1'] do
         it_should_print_n_records 1
-        it_should_print_column "Name"
-        it_should_print_column "Id"
-        it_should_print_column "Vendor class"
-        it_should_print_column "HW model"
-        it_should_print_column "Info"
-        it_should_print_column "Created at"
-        it_should_print_column "Updated at"
+        it_should_print_column 'Name'
+        it_should_print_column 'Id'
+        it_should_print_column 'Vendor class'
+        it_should_print_column 'HW model'
+        it_should_print_column 'Info'
+        it_should_print_column 'Created at'
+        it_should_print_column 'Updated at'
       end
     end
 
   end
 
 
-  context "CreateCommand" do
+  context 'CreateCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::CreateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::CreateCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+    context 'parameters' do
+      it_should_accept 'name, info, vendor-class, hardware-model, organization, location',
+                       %w[--name=model --info=description --vendor-class=class --hardware-model=model --organization-id=1 --location-id=1]
       # it_should_fail_with "name missing", ["--info=description", "--vendor-class=class", "--hardware-model=model"]
       # TODO: temporarily disabled, parameters are checked in the api
     end
@@ -76,30 +76,30 @@ describe HammerCLIForeman::Model do
   end
 
 
-  context "DeleteCommand" do
+  context 'DeleteCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::DeleteCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::DeleteCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model"]
-      it_should_accept "id", ["--id=1"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+    context 'parameters' do
+      it_should_accept 'name', ['--name=model']
+      it_should_accept 'id', ['--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
 
   end
 
 
-  context "UpdateCommand" do
+  context 'UpdateCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::UpdateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::UpdateCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_accept "id", ["--id=1", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+    context 'parameters' do
+      it_should_accept 'name', ['--name=model', '--new-name=model2', '--info=description', '--vendor-class=class', '--hardware-model=model']
+      it_should_accept 'id', ['--id=1', '--new-name=model2', '--info=description', '--vendor-class=class', '--hardware-model=model']
+      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 params", []
       # it_should_fail_with "name or id missing", ["--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
       # TODO: temporarily disabled, parameters are checked in the id resolver

data/test/unit/operating_system_test.rb

@@ -18,8 +18,8 @@ describe HammerCLIForeman::OperatingSystem 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
@@ -42,8 +42,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
-      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
 
@@ -73,9 +73,8 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::CreateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, major, minor, family, release name", ["--name=media", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept "name, major, minor, family, release name, organization, location",
+                       ["--name=media", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome", "--organization-id=1", "--location-id=1"]
       # it_should_fail_with "name missing", ["--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
       # TODO: temporarily disabled, parameters are checked in the api
     end
@@ -93,8 +92,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
-      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
       # TODO: temporarily disabled, parameters are checked in the id resolver
     end
@@ -109,9 +108,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
-      it_should_accept "name, major, minor, family, release name", ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept "name, major, minor, family, release name, organization, location",
+                       ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome", "--organization-id=1", "--location-id=1"]
       # it_should_fail_with "no params", []
       # it_should_fail_with "label or id missing", ["--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -136,8 +134,6 @@ describe HammerCLIForeman::OperatingSystem do
       it_should_accept "name, value and os id", ["--name=domain", "--value=val", "--operatingsystem-id=1"]
       it_should_accept "name, value and os title", ["--name=domain", "--value=val", "--operatingsystem=Rhel 6.5"]
       it_should_accept "name, value, type and os id", ["--name=domain", "--value=val", "--parameter-type=string", "--operatingsystem-id=1"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
       # it_should_fail_with "name missing", ["--value=val", "--operatingsystem-id=id"]
       # it_should_fail_with "value missing", ["--name=name", "--operatingsystem-id=id"]
       # it_should_fail_with "os id missing", ["--name=name", "--value=val"]
@@ -154,8 +150,6 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "name and os id", ["--name=domain", "--operatingsystem-id=1"]
       it_should_accept "name and os title", ["--name=domain", "--operatingsystem=Rhel 6.5"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
       # it_should_fail_with "name missing", ["--operatingsystem-id=id"]
       # it_should_fail_with "os id missing", ["--name=name"]
       # TODO: temporarily disabled, parameters are checked in the id resolver

data/test/unit/option_builders_test.rb

@@ -209,7 +209,9 @@ describe HammerCLIForeman::ForemanOptionBuilder do
   end
 
   context "dependent searchables options expansion" do
-    let(:option_switches) { container.build(@build_options).map(&:switches) }
+    let(:option_switches) do
+      container.build(@build_options.merge(command: Class.new(HammerCLIForeman::Command))).map(&:switches)
+    end
 
     before :each do
       container.builders = [
@@ -218,51 +220,51 @@ describe HammerCLIForeman::ForemanOptionBuilder do
       ]
     end
 
-    it "does not filter searchable builders by default" do
-      @build_options = {:expand => {}}
+    it 'does not filter searchable builders by default' do
+      @build_options = { expand: {} }
       _(option_switches).must_equal [
-        ["--user"],
-        ["--user-label"],
-        ["--user-id"],
-        ["--post"],
-        ["--post-label"],
-        ["--post-id"]
+        ['--user-id'],
+        ['--user'],
+        ['--user-label'],
+        ['--post-id'],
+        ['--post'],
+        ['--post-label']
       ]
     end
 
-    it "adds dependent searchable builders on explicit requirement" do
-      @build_options = {:expand => {:including => [:posts, :comments]}}
+    it 'adds dependent searchable builders on explicit requirement' do
+      @build_options = { expand: { including: %i[posts comments] } }
       _(option_switches).must_equal [
-        ["--user"],
-        ["--user-label"],
-        ["--user-id"],
-        ["--post"],
-        ["--post-label"],
-        ["--post-id"],
-        ["--comment"],
-        ["--comment-label"],
-        ["--comment-id"]
+        ['--user-id'],
+        ['--user'],
+        ['--user-label'],
+        ['--post-id'],
+        ['--post'],
+        ['--post-label'],
+        ['--comment-id'],
+        ['--comment'],
+        ['--comment-label']
       ]
     end
 
-    it "filters dependent searchable builders on explicit requirement" do
-      @build_options = {:expand => {:except => [:users]}}
+    it 'filters dependent searchable builders on explicit requirement' do
+      @build_options = { expand: { except: [:users] } }
       _(option_switches).must_equal [
-        ["--post"],
-        ["--post-label"],
-        ["--post-id"]
+        ['--post-id'],
+        ['--post'],
+        ['--post-label']
       ]
     end
 
-    it "specifies custom set of dependent searchable builders on explicit requirement" do
-      @build_options = {:expand => {:only => [:comments, :users]}}
+    it 'specifies custom set of dependent searchable builders on explicit requirement' do
+      @build_options = { expand: { only: %i[comments users] } }
       _(option_switches).must_equal [
-        ["--user"],
-        ["--user-label"],
-        ["--user-id"],
-        ["--comment"],
-        ["--comment-label"],
-        ["--comment-id"]
+        ['--user-id'],
+        ['--user'],
+        ['--user-label'],
+        ['--comment-id'],
+        ['--comment'],
+        ['--comment-label']
       ]
     end
   end
@@ -327,7 +329,7 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
   let(:resource) { api.resource(:users) }
   let(:searchables) { FakeSearchables.new(["name", "label", "uuid"]) }
   let(:builder) { HammerCLIForeman::DependentSearchablesOptionBuilder.new(resource, searchables) }
-  let(:builder_params) { {} }
+  let(:builder_params) { { command: Class.new(HammerCLIForeman::Command) } }
   let(:options) { builder.build(builder_params) }
 
   describe "empty searchables" do
@@ -339,41 +341,40 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
     end
   end
 
-  describe "multiple searchables" do
-
-    it "creates correct switches" do
+  describe 'multiple searchables' do
+    it 'creates correct switches' do
       _(options.map(&:switches)).must_equal [
-        ["--user"],       # first option does not have the suffix
-        ["--user-label"], # other options with suffixes
-        ["--user-uuid"],
-        ["--user-id"]     # additional id
+        ['--user-id'],    # main option from API docs
+        ['--user'],       # additional option
+        ['--user-label'], # other options with suffixes
+        ['--user-uuid']
       ]
     end
 
-    it "creates correct option types" do
-      _(options.map(&:type)).must_equal [
-        "USER_NAME",
-        "USER_LABEL",
-        "USER_UUID",
-        "USER_ID",
+    it 'creates correct option types' do
+      _(options.map(&:type)).must_equal %w[
+        USER_ID
+        USER_NAME
+        USER_LABEL
+        USER_UUID
       ]
     end
 
-    it "creates correct descriptions" do
+    it 'creates correct descriptions' do
       _(options.map(&:description)).must_equal [
-        "Search by name",
-        "Search by label",
-        "Search by uuid",
-        "DESC"
+        'DESC',
+        'Search by name',
+        'Search by label',
+        'Search by uuid'
       ]
     end
 
-    it "creates correct attribute readers" do
-      _(options.map(&:read_method)).must_equal [
-        "option_user_name",
-        "option_user_label",
-        "option_user_uuid",
-        "option_user_id",
+    it 'creates correct attribute readers' do
+      _(options.map(&:read_method)).must_equal %w[
+        option_user_id
+        option_user_name
+        option_user_label
+        option_user_uuid
       ]
     end
 
@@ -385,44 +386,48 @@ describe HammerCLIForeman::DependentSearchablesOptionBuilder do
 
   describe "aliasing resource names" do
 
-    let(:builder_params) { {:resource_mapping => {:user => :usr}} }
+    let(:builder_params) do
+      {
+        resource_mapping: { user: :usr },
+        command: Class.new(HammerCLIForeman::Command)
+      }
+    end
 
-    it "renames options" do
+    it 'renames options' do
       _(options.map(&:switches)).must_equal [
-        ["--usr"],       # first option does not have the suffix
-        ["--usr-label"], # other options with suffixes
-        ["--usr-uuid"],
-        ["--usr-id"]     # additional id
+        ['--usr-id'],    # parent option id
+        ['--usr'],       # additional option
+        ['--usr-label'], # other options with suffixes
+        ['--usr-uuid']
       ]
     end
 
-    it "renames option types" do
-      _(options.map(&:type)).must_equal [
-        "USR_NAME",
-        "USR_LABEL",
-        "USR_UUID",
-        "USR_ID",
+    it 'renames option types' do
+      _(options.map(&:type)).must_equal %w[
+        USR_ID
+        USR_NAME
+        USR_LABEL
+        USR_UUID
       ]
     end
 
-    it "keeps option accessor the same" do
-      _(options.map(&:attribute_name)).must_equal [
-        "option_user_name",
-        "option_user_label",
-        "option_user_uuid",
-        "option_user_id"
+    it 'keeps option accessor the same' do
+      _(options.map(&:attribute_name)).must_equal %w[
+        option_user_id
+        option_user_name
+        option_user_label
+        option_user_uuid
       ]
     end
   end
 
-  describe "resources with id parameter in show action" do
-
-    it "uses descriptions from the action" do
+  describe 'resources with id parameter in show action' do
+    it 'uses descriptions from the action' do
       _(options.map(&:description)).must_equal [
-        "Search by name",
-        "Search by label",
-        "Search by uuid",
-        "DESC"
+        'DESC',
+        'Search by name',
+        'Search by label',
+        'Search by uuid'
       ]
     end
   end

data/test/unit/settings_test.rb

@@ -18,8 +18,8 @@ describe HammerCLIForeman::Settings 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
@@ -40,8 +40,8 @@ describe HammerCLIForeman::Settings do
     context "parameters" do
       it_should_accept "name", ["--name=setting1", "--value=setting2"]
       it_should_accept "id", ["--id=1", "--value=setting2"]
-      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

data/test/unit/smart_proxy_test.rb

@@ -90,18 +90,6 @@ describe HammerCLIForeman::SmartProxy do
 
   end
 
-  context "ImportPuppetClassesCommand" do
-
-    let(:cmd) { HammerCLIForeman::SmartProxy::ImportPuppetClassesCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "id, environment-id and dryrun", ["--id=1", "--environment-id=1", "--dryrun"]
-      # it_should_fail_with "id missing", []
-      # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RefreshFeaturesCommand" do
 
     let(:cmd) { HammerCLIForeman::SmartProxy::RefreshFeaturesCommand.new("", ctx) }

data/test/unit/usergroup_test.rb

@@ -18,8 +18,8 @@ describe HammerCLIForeman::Usergroup 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
@@ -37,8 +37,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=ug"]
-      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
@@ -62,8 +62,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "name", ["--name=ug"]
       it_should_accept "name, role ids, user group ids and user ids", ["--name=ug", "--role-ids=1,2,3", "--user-group-ids=1,2,3", "--user-ids=1,2,3"]
-      it_should_fail_with 'organization param', ['--organization-id=1']
-      it_should_fail_with 'location param', ['--location-id=1']
+      it_should_accept 'organization', %w[--name=ug --organization-id=1]
+      it_should_accept 'location', %w[--name=ug --location-id=1]
     end
   end
 
@@ -74,8 +74,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "name", ["--name=ug"]
       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]
     end
   end
 
@@ -88,8 +88,8 @@ describe HammerCLIForeman::Usergroup do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name and new name", ["--name=ug", "--new-name=ug2"]
       it_should_accept "id, new name, role ids, user group ids and user ids", ["--id=1", "--new-name=ug", "--role-ids=1,2,3", "--user-group-ids=1,2,3", "--user-ids=1,2,3"]
-      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