hammer_cli_foreman 3.6.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0498fc381643ec00359362e585a879ae2e6ef425f8546b6b1f1245ce4dd2891
-  data.tar.gz: 060dfe82dbe23fec7a3a84d89e8077c756c5e87aced3617a5b8923c8a2827967
+  metadata.gz: ee6e69c32f2da750f35474c76deab901c34156e02f588831793b7f668e3445db
+  data.tar.gz: db9db4349a41cf3e1058b33de2cdb599df9526dc6477c12d8fbb8cb3cfccba1b
 SHA512:
-  metadata.gz: d913007afab58dbc5b387f3536215f2e1ce9fd7190eb1fbd7e494ee30e6bba325045d864e1f0d1326690922715a506fd44c7df1f5e6ec1340ade26425580e5e2
-  data.tar.gz: ec80e3b7f0386b4786830e0e676ea172ea3472b4ecd771aae5c3239720cd5bcf34846e91e5cda1a816e6f5d864269a72b202ad1b1a164769661584f7dbac7da6
+  metadata.gz: 38103b52f65f395870d1cf31da86d4df330248f06ffceb346ed63ec1c9bfb7a7f79a8bfd30fd46d458af97b47ef3c9d08cdd32c056e9eb4765bbef4f2d74be91
+  data.tar.gz: 5c57d8514e09458120a4e01dda31de420b27c85616572ad6577fccf486065294d9308b6b70f344c36070b4d08e52dbfd6f5d78a980f98e81256d95f45ff84a15

data/doc/release_notes.md

@@ -1,5 +1,18 @@
 Release notes
 =============
+### 3.8.0 (2023-08-25)
+* Support mocha 2.1 ([PR #618](https://github.com/theforeman/hammer-cli-foreman/pull/618)), [#34879](http://projects.theforeman.org/issues/34879)
+* Add ga to run tests on ruby 3+ ([PR #617](https://github.com/theforeman/hammer-cli-foreman/pull/617))
+* Update tx for hammer-cli-foreman, [#36315](http://projects.theforeman.org/issues/36315)
+* Add packit config
+* Bump to 3.8.0-develop
+
+### 3.7.0 (2023-05-23)
+* Update rake for hammer-cli-foreman ([PR #613](https://github.com/theforeman/hammer-cli-foreman/pull/613)), [#36337](http://projects.theforeman.org/issues/36337)
+* Update minitest version ([PR #611](https://github.com/theforeman/hammer-cli-foreman/pull/611)), [#36349](http://projects.theforeman.org/issues/36349)
+* Allow to suppress nothing to update message, [#36213](http://projects.theforeman.org/issues/36213)
+* Bump to 3.7.0-develop
+
 ### 3.6.0 (2023-02-23)
 * Support basic auth for external sources, [#11317](http://projects.theforeman.org/issues/11317)
 * Remove underscore from labels ([PR #608](https://github.com/theforeman/hammer-cli-foreman/pull/608)), [#35904](http://projects.theforeman.org/issues/35904)

data/lib/hammer_cli_foreman/command_extensions/update_common.rb

@@ -7,7 +7,7 @@ module HammerCLIForeman
 
       request_params do |params, command_object|
         update_params = params[command_object.resource.singular_name]
-        command_object.context[:action_message] = :nothing_to_do if update_params && update_params.empty?
+        command_object.context[:action_message] = :nothing_to_do if update_params && update_params.empty? && command_object.context[:action_message].nil?
       end
     end
   end

data/lib/hammer_cli_foreman/commands.rb

@@ -244,7 +244,7 @@ module HammerCLIForeman
       super
       begin
         output_definition.update_field_sets('THIN', (searchables.for(resource).map(&:name) + ['id']).map(&:to_sym))
-      rescue StandardError => e
+      rescue StandardError
         # Some subcommands may not have such fields or defined resource
       end
     end
@@ -489,7 +489,7 @@ module HammerCLIForeman
       super
       begin
         output_definition.update_field_sets('THIN', (searchables.for(resource).map(&:name) + ['id']).map(&:to_sym))
-      rescue StandardError => e
+      rescue StandardError
         # Some subcommands may not have such fields or defined resource
       end
     end
@@ -585,8 +585,6 @@ module HammerCLIForeman
     action :update
 
     def self.create_option_builder
-      configurator = BuilderConfigurator.new(searchables, dependency_resolver)
-
       builder = ForemanOptionBuilder.new(searchables)
       builder.builders = [
         SearchablesOptionBuilder.new(resource, searchables),

data/lib/hammer_cli_foreman/compute_resource/utils.rb

@@ -13,13 +13,13 @@ module HammerCLIForeman
           HammerCLIForeman.foreman_resource(:hostgroups).call(:show, 'id' => hostgroup_id)
       )
       compute_resource_id = hostgroup['compute_resource_id']
-       if !hostgroup['compute_resource_name'].to_s.strip.empty? && compute_resource_id.nil?
-         compute_resource= HammerCLIForeman.record_to_common_format(
-            HammerCLIForeman.foreman_resource(:compute_resources).call(
-                :index, :search => "name = \"#{hostgroup['compute_resource_name']}\""
-            )
-         )
-         compute_resource_id = compute_resource['results'][0]['id'] if compute_resource['results'][0]
+      if !hostgroup['compute_resource_name'].to_s.strip.empty? && compute_resource_id.nil?
+        compute_resource= HammerCLIForeman.record_to_common_format(
+          HammerCLIForeman.foreman_resource(:compute_resources).call(
+              :index, :search => "name = \"#{hostgroup['compute_resource_name']}\""
+          )
+        )
+        compute_resource_id = compute_resource['results'][0]['id'] if compute_resource['results'][0]
       end
       compute_resource_id
     end

data/lib/hammer_cli_foreman/exception_handler.rb

@@ -99,7 +99,7 @@ module HammerCLIForeman
         response = JSON.parse(e.response)
         response = HammerCLIForeman.record_to_common_format(response) unless response.has_key?('message')
         message = response['message'] || e.message
-      rescue JSON::ParserError => parse_e
+      rescue JSON::ParserError
         message = e.message
       end
 
@@ -123,13 +123,7 @@ module HammerCLIForeman
       host_url = HammerCLI::Settings.get(:_params, :host) || HammerCLI::Settings.get(:foreman, :host)
       uri = URI.parse(host_url)
       ssl_option = HammerCLI::SSLOptions.new.get_options(uri)
-      if uri.host.nil?
-        host = '<FOREMAN_HOST>'
-        cert_name = "#{host}.crt"
-      else
-        host = uri.to_s
-        cert_name = "#{uri.host}.crt"
-      end
+      host = uri.host.nil? ? '<FOREMAN_HOST>' : uri.to_s
 
       cmd = "hammer --fetch-ca-cert #{host}"
 

data/lib/hammer_cli_foreman/external_usergroup.rb

@@ -1,5 +1,3 @@
-require 'hammer_cli_foreman/usergroup'
-
 module HammerCLIForeman
   class ExternalUsergroup < HammerCLIForeman::Command
     resource :external_usergroups

data/lib/hammer_cli_foreman/resource_supported_test.rb

@@ -15,7 +15,7 @@ module HammerCLIForeman
     def resource_supported?
       resource.call(:index)
       true
-    rescue RestClient::ResourceNotFound => e
+    rescue RestClient::ResourceNotFound
       false
     end
 

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -12,12 +12,12 @@ module HammerCLIForeman
         def initialize(resource=nil, action=nil, &block)
           @expected_resource = resource
           @expected_action = action
-          @block = block if block_given?
+          @block = block
           @expected_params = {}
         end
 
         def matches?(actual_parameters)
-          action, params, headers, options = actual_parameters.shift(4)
+          action, params, _headers, _options = actual_parameters.shift(4)
           action_name = action.name.to_s
           resource_name = action.resource.to_s
 

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "3.6.0"
+    @version ||= Gem::Version.new "3.8.0"
   end
 end

data/test/functional/associating_commands_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'hammer_cli_foreman/operating_system'
 
 describe HammerCLIForeman::OperatingSystem do
-  context 'AddProvisioningTemplateCommand' do
+  describe 'AddProvisioningTemplateCommand' do
     before do
       @cmd = ['os', 'add-provisioning-template']
       @os_before_update = {
@@ -106,7 +106,7 @@ describe HammerCLIForeman::OperatingSystem do
 
   end
 
-  context 'RemoveProvisioningTemplateCommand' do
+  describe 'RemoveProvisioningTemplateCommand' do
     before do
       @cmd = ['os', 'remove-provisioning-template']
       @os_before_update = {

data/test/functional/bookmark_test.rb

@@ -87,8 +87,8 @@ describe 'bookmark' do
       it 'should create a bookmark' do
         params = ['--name=newBookmark', '--controller=hosts', '--query=status = failed']
         api_expects(:bookmarks, :create, 'Create bookmark') do |params|
-          (params['bookmark']['name'] == 'newBookmark')
-          (params['bookmark']['controller'] == 'hosts')
+          (params['bookmark']['name'] == 'newBookmark') &&
+          (params['bookmark']['controller'] == 'hosts') &&
           (params['bookmark']['query'] == 'status = failed')
         end
         result = run_cmd(@cmd + params)

data/test/functional/commands/list_test.rb

@@ -33,7 +33,7 @@ describe HammerCLIForeman::ListCommand do
     HammerCLI::Settings.clear
   end
 
-  context 'help' do
+  describe 'help' do
     let(:cmd) { ['host', 'list'] }
     let(:params) { ['--help'] }
 
@@ -49,7 +49,7 @@ describe HammerCLIForeman::ListCommand do
   end
 
   describe "api interaction" do
-    context "without per_page in settings" do
+    describe "without per_page in settings" do
       it "fetches only first page when there's not enough records" do
         expect_paged_call(1, 1000, 10)
         result = run_cmd([], {}, TestList)
@@ -86,7 +86,7 @@ describe HammerCLIForeman::ListCommand do
       end
     end
 
-    context "with per_page in settings" do
+    describe "with per_page in settings" do
       let(:per_page_in_settings) { 30 }
       before do
         HammerCLI::Settings.load({ :ui => { :per_page => per_page_in_settings } })
@@ -139,7 +139,7 @@ describe HammerCLIForeman::ListCommand do
       assert_cmd(expected_result, result)
     end
 
-    context 'with per_page in settings' do
+    describe 'with per_page in settings' do
       before do
         HammerCLI::Settings.load({ :ui => { :per_page => '1' } })
       end

data/test/functional/filter_test.rb

@@ -40,7 +40,7 @@ describe 'filter' do
       params = ['--role-id=1', '--permission-ids=[1]']
 
       api_expects(:filters, :create) do |params|
-        (params['filter']['role_id'] == 1)
+        (params['filter']['role_id'] == '1') &&
         (params['filter']['permission_ids'] == [1])
       end
 

data/test/functional/location_test.rb

@@ -262,7 +262,7 @@ describe 'update' do
 
     api_expects(:locations, :index)
     api_expects(:locations, :update, 'Update a location') do |params|
-      (params['location']['id'] == '1')
+      (params['id'] == '1') &&
       (params['location']['name'] == 'Default Location test')
     end
 

data/test/functional/media_test.rb

@@ -77,7 +77,7 @@ describe 'medium' do
       params = ['--name=CentOS mirror', '--path=http://mirror.centos.org/centos/$major/os/$arch']
 
       api_expects(:media, :create) do |params|
-        (params['medium']['name'] == 'CentOS mirror')
+        (params['medium']['name'] == 'CentOS mirror') &&
         (params['medium']['path'] == 'http://mirror.centos.org/centos/$major/os/$arch')
       end
 
@@ -119,7 +119,7 @@ describe 'medium' do
       params = ['--id=1', '--new-name=CentOS mirror test']
 
       api_expects(:media, :update, 'Update a media') do |params|
-        (params['medium']['id'] == '1')
+        (params['id'] == '1') &&
         (params['medium']['name'] == 'CentOS mirror test')
       end
 

data/test/functional/report_template_test.rb

@@ -114,7 +114,7 @@ describe 'report-template' do
 
     it 'invokes editor in interactive mode' do
       params = ['--name=test', '--default=yes', "--interactive", '--locked=no', '--snippet=no']
-      HammerCLI.expects(:open_in_editor).with("", {:content_type => "report_template", :suffix => ".erb"}).returns('Template content')
+      HammerCLI.expects(:open_in_editor).with("", content_type: "report_template", suffix: ".erb").returns('Template content')
       api_expects(:report_templates, :create, 'Create template').with_params(
         'report_template' => {
           'name' => 'test',
@@ -181,7 +181,7 @@ describe 'report-template' do
     it 'invokes editor in interactive mode' do
       params = ['--id=3', '--new-name=test', '--default=yes', "--interactive", '--locked=no', '--snippet=no']
       HammerCLI.expects(:open_in_editor).with(
-        "Template Content", {:content_type => "report_template", :suffix => ".erb"}).returns('Template content')
+        "Template Content", content_type: "report_template", suffix: ".erb").returns('Template content')
       api_expects(:report_templates, :show, 'Show').with_params('id' => '3').returns(third_report)
       api_expects(:report_templates, :update, 'Update template').with_params(
         'report_template' => {
@@ -307,7 +307,7 @@ describe 'report-template' do
       { 'job_id' => job_id, 'data_url' => "/report_data/#{job_id}" }
     end
 
-    context 'without --wait' do
+    describe 'without --wait' do
       it 'schedule report and prints out data for getting the result' do
         params = ['--id=3', '--inputs=Host filter=filter']
         api_expects(:report_templates, :schedule_report, 'Schedule').with_params(
@@ -320,7 +320,7 @@ describe 'report-template' do
       end
     end
 
-    context 'with --wait' do
+    describe 'with --wait' do
       it 'generates the report to the file' do
         params = ['--id=3', '--inputs=Host filter=filter', '--wait', '--path=/tmp']
         api_expects(:report_templates, :schedule_report, 'Schedule').with_params(

data/test/functional/settings_test.rb

@@ -101,7 +101,7 @@ describe 'Settings' do
       params = ['--id=1', '--value=true']
 
       api_expects(:settings, :update, 'Update a setting') do |params|
-        (params['setting']['id'] == '1')
+        (params['id'] == '1') &&
         (params['setting']['value'] == 'true')
       end
 

data/test/functional/virtual_machine_test.rb

@@ -5,7 +5,7 @@ require 'hammer_cli_foreman/compute_resource'
 
 describe HammerCLIForeman::VirtualMachine do
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
     before do
       @cmd = ["compute-resource", "virtual-machine", "info"]
       @vm = {
@@ -43,7 +43,7 @@ describe HammerCLIForeman::VirtualMachine do
 
   end
 
-  context "ListCommand" do
+  describe "ListCommand" do
     before do
       @cmd = ["compute-resource", "virtual-machines"]
       @available_virtual_machines = [
@@ -68,7 +68,7 @@ describe HammerCLIForeman::VirtualMachine do
     end
   end
 
-  context "PowerCommand" do
+  describe "PowerCommand" do
     before do
       @cmd = ["compute-resource", "virtual-machine", "power"]
     end
@@ -97,7 +97,7 @@ describe HammerCLIForeman::VirtualMachine do
     end
   end
 
-  context "DeleteCommand" do
+  describe "DeleteCommand" do
     before do
       @cmd = ["compute-resource", "virtual-machine", "delete"]
     end

data/test/test_helper.rb

@@ -11,7 +11,6 @@ SimpleCov.root Pathname.new(File.dirname(__FILE__) + "../../../")
 
 require 'minitest/autorun'
 require 'minitest/spec'
-require "minitest-spec-context"
 require "mocha/minitest"
 
 require 'hammer_cli'

data/test/unit/api/interactive_basic_auth_test.rb

@@ -4,7 +4,7 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
   let(:request) { mock() }
   let(:args) { {} }
 
-  context "interactive mode" do
+  describe "interactive mode" do
     before :each do
       HammerCLI.stubs(:interactive?).returns true
     end
@@ -42,7 +42,7 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
     end
   end
 
-  context "non-interactive mode" do
+  describe "non-interactive mode" do
     it "doesn't ask for credentials when they're not provided" do
       HammerCLI.stubs(:interactive?).returns false
       auth = HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, nil)

data/test/unit/api/oauth/oauth_authentication_code_grant_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
 describe HammerCLIForeman::Api::Oauth::AuthenticationCodeGrant do
-  let(:request) { mock().stubs({}) }
+  let(:request) { {} }
   let(:args) { {} }
   let(:params) {{
     oidc_redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
@@ -33,7 +33,7 @@ describe HammerCLIForeman::Api::Oauth::AuthenticationCodeGrant do
     end
   end
 
-  context "interactive mode" do
+  describe "interactive mode" do
     before :each do
       HammerCLI.stubs(:interactive?).returns true
     end

data/test/unit/api/oauth/oauth_password_grant_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
 describe HammerCLIForeman::Api::Oauth::PasswordGrant do
-  let(:request) { mock().stubs({}) }
+  let(:request) { {} }
   let(:args) { {} }
   let(:params) {{
     username: 'user1',
@@ -31,7 +31,7 @@ describe HammerCLIForeman::Api::Oauth::PasswordGrant do
     end
   end
 
-  context "interactive mode" do
+  describe "interactive mode" do
     before :each do
       HammerCLI.stubs(:interactive?).returns true
     end

data/test/unit/api/session_authenticator_wrapper_test.rb

@@ -52,7 +52,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
   end
 
   describe '#authenticate' do
-    context "when there's saved session" do
+    describe "when there's saved session" do
       it 'sets session id in cookies for basic auth' do
         session_params = {
           session_id: 'SOME_SESSION_ID', auth_type: 'Basic_Auth'
@@ -139,9 +139,9 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
       end
     end
 
-    context "when the session file is corrupted" do
+    describe "when the session file is corrupted" do
       it 'reports error' do
-        dir, out, err = prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
+        _dir, _out, err = prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
           write_session(dir, '{not a valid: json')
 
           wrapped_auth.expects(:authenticate).with(request, args)
@@ -152,7 +152,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
       end
     end
 
-    context "when no session is saved" do
+    describe "when no session is saved" do
       it 'passes to wrapped authenticator' do
         prepare_session_storage do |auth, dir|
           wrapped_auth.expects(:authenticate).with(request, args)
@@ -164,7 +164,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
   end
 
   describe '#error' do
-    context 'when there is existing session' do
+    describe 'when there is existing session' do
       it 'sets session id to nil on unauthorized exception' do
         prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
           ex = RestClient::Unauthorized.new
@@ -204,7 +204,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
         end
       end
 
-      context 'when user has changed' do
+      describe 'when user has changed' do
         it 'sets a special error message' do
           prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
             auth.force_user_change
@@ -227,7 +227,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
       end
     end
 
-    context 'when there is no existing session' do
+    describe 'when there is no existing session' do
       it 'passes exception to wrapped authenticator on unauthorized exception' do
         prepare_session_storage do |auth, dir|
           ex = RestClient::Unauthorized.new

data/test/unit/architecture_test.rb

@@ -7,21 +7,21 @@ describe HammerCLIForeman::Architecture do
 
   include CommandTestHelper
 
-  context "ListCommand" do
+  describe "ListCommand" do
     before do
       ResourceMocks.mock_action_call(:architectures, :index, [])
     end
 
     let(:cmd) { HammerCLIForeman::Architecture::ListCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
       it_should_accept 'organization', ['--organization-id=1']
       it_should_accept 'location', ['--location-id=1']
     end
 
-    context "output" do
+    describe "output" do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
@@ -32,11 +32,11 @@ describe HammerCLIForeman::Architecture do
   end
 
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
 
     let(:cmd) { HammerCLIForeman::Architecture::InfoCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=arch"]
       it_should_accept 'organization', %w[--id=1 --organization-id=1]
@@ -44,7 +44,7 @@ describe HammerCLIForeman::Architecture do
       # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_column "Name"
@@ -55,11 +55,11 @@ describe HammerCLIForeman::Architecture do
   end
 
 
-  context "CreateCommand" do
+  describe "CreateCommand" do
 
     let(:cmd) { HammerCLIForeman::Architecture::CreateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name", ["--name=arch"]
       it_should_accept 'organization', %w[--name=arch --organization-id=1]
       it_should_accept 'location', %w[--name=arch --location-id=1]
@@ -70,11 +70,11 @@ describe HammerCLIForeman::Architecture do
   end
 
 
-  context "DeleteCommand" do
+  describe "DeleteCommand" do
 
     let(:cmd) { HammerCLIForeman::Architecture::DeleteCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name", ["--name=arch"]
       it_should_accept "id", ["--id=1"]
       it_should_accept 'organization', %w[--id=1 --organization-id=1]
@@ -85,11 +85,11 @@ describe HammerCLIForeman::Architecture do
   end
 
 
-  context "UpdateCommand" do
+  describe "UpdateCommand" do
 
     let(:cmd) { HammerCLIForeman::Architecture::UpdateCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "name", ["--name=arch", "--new-name=arch2"]
       it_should_accept "id", ["--id=1", "--new-name=arch2"]
       it_should_accept 'organization', %w[--id=1 --new-name=arch2 --organization-id=1]

data/test/unit/audit_test.rb

@@ -6,19 +6,19 @@ require 'hammer_cli_foreman/audit'
 describe HammerCLIForeman::Audit do
   include CommandTestHelper
 
-  context "ListCommand" do
+  describe "ListCommand" do
     before do
       ResourceMocks.mock_action_call(:audits, :index, [])
     end
 
     let(:cmd) { HammerCLIForeman::Audit::ListCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
     end
 
-    context "output" do
+    describe "output" do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
@@ -32,18 +32,18 @@ describe HammerCLIForeman::Audit do
     end
   end
 
-  context "InfoCommand" do
+  describe "InfoCommand" do
     before do
         cmd.stubs(:extend_data)
     end
 
     let(:cmd) { HammerCLIForeman::Audit::InfoCommand.new("", ctx) }
 
-    context "parameters" do
+    describe "parameters" do
       it_should_accept "id", ["--id=1"]
     end
 
-    context "output" do
+    describe "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_column "Id"