foreman_remote_execution 12.0.7 → 13.0.0

data/locale/zh_TW/foreman_remote_execution.po

@@ -79,6 +79,9 @@ msgstr "要使用執行這 script 的使用者。如果使用者與 SSH 使用
 msgid "Abort Job"
 msgstr ""
 
+msgid "Access denied"
+msgstr ""
+
 msgid "Actions"
 msgstr "動作"
 
@@ -124,6 +127,9 @@ msgstr "於"
 msgid "At minute"
 msgstr ""
 
+msgid "Awaiting start"
+msgstr ""
+
 msgid "Back"
 msgstr ""
 
@@ -370,9 +376,6 @@ msgstr ""
 msgid "Ends"
 msgstr "結束"
 
-msgid "Error"
-msgstr "錯誤"
-
 msgid "Error loading data from proxy"
 msgstr "從代理載入資料時發生錯誤"
 
@@ -703,6 +706,9 @@ msgstr "手動選擇"
 msgid "Minute can only be a number between 0-59"
 msgstr ""
 
+msgid "Missing the required permissions: ${missingPermissions.join( ', ' )}"
+msgstr ""
+
 msgid "Monthly"
 msgstr "每個月"
 
@@ -733,9 +739,6 @@ msgstr ""
 msgid "No Target Hosts"
 msgstr ""
 
-msgid "No execution finished yet"
-msgstr "尚無執行完成"
-
 msgid "No hosts found."
 msgstr "找不到主機。"
 
@@ -751,6 +754,9 @@ msgstr "沒有範本定義至功能 %{feature_name}"
 msgid "Not all required inputs have values. Missing inputs: %s"
 msgstr "並不是所需的輸入都有值。缺少的輸入：%s"
 
+msgid "Not available"
+msgstr ""
+
 msgid "Not yet"
 msgstr ""
 
@@ -802,6 +808,9 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
+msgid "Permission Denied"
+msgstr ""
+
 msgid "Please enter a search query"
 msgstr ""
 
@@ -811,6 +820,9 @@ msgstr ""
 msgid "Please refine your search."
 msgstr ""
 
+msgid "Please request the required permissions listed below from a Foreman administrator:"
+msgstr ""
+
 msgid "Please select at least one host"
 msgstr ""
 
@@ -844,6 +856,9 @@ msgstr ""
 msgid "Problem with previewing the template: %{error}. Note that you must save template input changes before you try to preview it."
 msgstr "預覽範本時發生問題：%{error}。請注意，您必須在預覽範本前，先儲存範本輸入的變更。"
 
+msgid "Proceed Anyway"
+msgstr ""
+
 msgid "Provider type"
 msgstr "供應商種類"
 
@@ -1458,6 +1473,9 @@ msgstr ""
 msgid "You are not allowed to see the currently assigned template. Saving the form now would unassign the template."
 msgstr "您不能看到目前指定的範本。現在儲存表單會取消指定範本。"
 
+msgid "You are not authorized to perform this action."
+msgstr ""
+
 msgid "You have %s results to display. Showing first %s results"
 msgstr ""
 

data/package.json

@@ -8,10 +8,7 @@
     "test": "tfm-test --plugin",
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
-    "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
-    "stories:deploy": "surge --project .storybook-dist"
+    "publish-coverage": "tfm-publish-coverage"
   },
   "repository": {
     "type": "git",
@@ -21,7 +18,6 @@
     "url": "http://projects.theforeman.org/projects/foreman_remote_execution/issues"
   },
   "devDependencies": {
-    "@adobe/css-tools": "~4.2.0",
     "@babel/core": "^7.7.0",
     "@theforeman/builder": "^12.0.1",
     "@theforeman/eslint-plugin-foreman": "^12.0.1",

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -272,7 +272,7 @@ module Api
           assert_equal result['complete'], false
           assert_equal result['delayed'], true
           assert_nil result['output']
-          _(Time.parse(result['start_at']).to_f).must_be_close_to start_time.to_f
+          assert_in_delta start_time.to_f, Time.parse(result['start_at']).to_f, 0.001
           assert_response :success
         end
 
@@ -334,8 +334,8 @@ module Api
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
-        _(targeting.user_id).must_equal users(:admin).id
-        _(targeting.search_query).must_equal @invocation.targeting.search_query
+        assert_equal users(:admin).id, targeting.user_id
+        assert_equal @invocation.targeting.search_query, targeting.search_query
       end
 
       test 'should not raise an exception when reruning failed has no hosts' do
@@ -350,8 +350,8 @@ module Api
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
-        _(targeting.user_id).must_equal users(:admin).id
-        _(targeting.search_query).must_equal 'name ^ ()'
+        assert_equal users(:admin).id, targeting.user_id
+        assert_equal 'name ^ ()', targeting.search_query
       end
 
       test 'should rerun failed only' do
@@ -369,8 +369,8 @@ module Api
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
         hostnames = @invocation.template_invocations.map { |ti| ti.host.name }
-        _(targeting.user_id).must_equal users(:admin).id
-        _(targeting.search_query).must_equal "name ^ (#{hostnames.join(',')})"
+        assert_equal users(:admin).id, targeting.user_id
+        assert_equal "name ^ (#{hostnames.join(',')})", targeting.search_query
       end
 
       test 'should return 404 if template is not found' do

data/test/functional/api/v2/template_invocations_controller_test.rb

@@ -13,8 +13,8 @@ module Api
       test 'should get template invocations belonging to job invocation' do
         get :template_invocations, params: { :id => @job.id }
         invocations = ActiveSupport::JSON.decode(@response.body)
-        _(invocations['results'].count).must_equal @job.template_invocations.count
-        _(invocations['total']).must_equal @job.template_invocations.count
+        assert_equal @job.template_invocations.count, invocations['results'].count
+        assert_equal @job.template_invocations.count, invocations['total']
 
         expected_result = {
           'id'                   => @template_invocation.id,
@@ -25,7 +25,7 @@ module Api
           'job_invocation_id'    => @job.id,
           'run_host_job_task_id' => @template_invocation.run_host_job_task_id,
         }
-        _(invocations['results']).must_equal [expected_result]
+        assert_equal [expected_result], invocations['results']
         assert_response :success
       end
     end

data/test/helpers/remote_execution_helper_test.rb

@@ -14,13 +14,14 @@ class RemoteExecutionHelperTest < ActionView::TestCase
 
     it 'ensures the line sets end with new line' do
       new_line_sets = normalize_line_sets(line_sets)
-      new_line_sets.map { |s| s['output'] }.must_equal(["one\r\n",
-                                                        "two\r\n",
-                                                        "\r\nthree\r\n",
-                                                        "four\r\n",
-                                                        "\r\n\r\n",
-                                                        "five\r\n",
-                                                        "Exit status: 0"])
+      expected_output = ["one\r\n",
+                         "two\r\n",
+                         "\r\nthree\r\n",
+                         "four\r\n",
+                         "\r\n\r\n",
+                         "five\r\n",
+                         "Exit status: 0"]
+      assert_equal(expected_output, new_line_sets.map { |s| s['output'] })
     end
   end
 

data/test/unit/actions/run_host_job_test.rb

@@ -53,7 +53,7 @@ module ForemanRemoteExecution
         exception = assert_raises do
           action.send(:verify_permissions, template_invocation.host, template_invocation)
         end
-        _(exception.message).must_include "infrastructure host #{template_invocation.host.name}"
+        assert_includes exception.message, "infrastructure host #{template_invocation.host.name}"
       end
     end
 

data/test/unit/actions/run_hosts_job_test.rb

@@ -65,13 +65,13 @@ module ForemanRemoteExecution
         delayed
         assert_not targeting.resolved?
         planned
-        _(targeting.hosts).must_include(host)
+        assert_includes targeting.hosts, host
       end
 
       it 'resolves the hosts on static targeting in delay' do
         assert_not targeting.resolved?
         delayed
-        _(targeting.hosts).must_include(host)
+        assert_includes targeting.hosts, host
         # Verify Targeting#resolve_hosts! won't be hit again
         targeting.expects(:resolve_hosts!).never
         planned
@@ -79,7 +79,7 @@ module ForemanRemoteExecution
 
       it 'resolves the hosts on static targeting in plan phase if not resolved yet' do
         planned
-        _(targeting.hosts).must_include(host)
+        assert_includes targeting.hosts, host
       end
     end
 
@@ -91,16 +91,16 @@ module ForemanRemoteExecution
 
     it 'uses the BindJobInvocation middleware' do
       planned
-      _(job_invocation.task_id).must_equal uuid
+      assert_equal job_invocation.task_id, uuid
     end
 
     # In plan phase this is handled by #action_subject
     #   which is expected in tests
     it 'sets input in delay phase when delayed' do
       job_invocation_hash = delayed.input[:job_invocation]
-      _(job_invocation_hash['id']).must_equal job_invocation.id
-      _(job_invocation_hash['name']).must_equal job_invocation.job_category
-      _(job_invocation_hash['description']).must_equal job_invocation.description
+      assert_equal job_invocation_hash['id'], job_invocation.id
+      assert_equal job_invocation_hash['name'], job_invocation.job_category
+      assert_equal job_invocation_hash['description'], job_invocation.description
       planned # To make the expectations happy
     end
 
@@ -108,7 +108,7 @@ module ForemanRemoteExecution
       it 'defaults to Setting[foreman_tasks_proxy_batch_size]' do
         Setting.expects(:[]).with('foreman_tasks_proxy_batch_size').returns(14)
         planned
-        _(planned.proxy_batch_size).must_equal 14
+        assert_equal 14, planned.proxy_batch_size
       end
 
       it 'gets the provider value' do
@@ -116,7 +116,7 @@ module ForemanRemoteExecution
         provider.expects(:proxy_batch_size).returns(15)
         JobTemplate.any_instance.expects(:provider).returns(provider)
 
-        _(planned.proxy_batch_size).must_equal 15
+        assert_equal 15, planned.proxy_batch_size
       end
     end
 
@@ -124,12 +124,12 @@ module ForemanRemoteExecution
       let(:level) { 5 }
 
       it 'can be disabled' do
-        _(planned.concurrency_limit).must_equal nil
+        assert_nil planned.concurrency_limit
       end
 
       it 'can limit concurrency level' do
         job_invocation.expects(:concurrency_level).twice.returns(level)
-        _(planned.concurrency_limit).must_equal level
+        assert_equal level, planned.concurrency_limit
       end
     end
 

data/test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb

@@ -13,17 +13,17 @@ class ForemanRemoteExecutionForemanTasksCleanerExtensionsTest < ActiveSupport::T
   it 'tries to delete associated job invocations' do
     job = FactoryBot.create(:job_invocation, :with_task)
     ForemanTasks::Cleaner.new(:filter => "id = #{job.task.id}").delete
-    JobInvocation.where(:id => job.id).must_be :empty?
+    assert_empty JobInvocation.where(:id => job.id)
   end
 
   it 'removes orphaned job invocations' do
     job = FactoryBot.create(:job_invocation, :with_task)
-    _(JobInvocation.where(:id => job.id).count).must_equal 1
+    assert_equal 1, JobInvocation.where(:id => job.id).count
     job.task.delete
     job.reload
-    _(job.task).must_be :nil?
-    _(job.task_id).wont_be :nil?
+    assert_nil job.task
+    refute_nil job.task_id
     ForemanTasks::Cleaner.new(:filter => '').delete
-    JobInvocation.where(:id => job.id).must_be :empty?
+    assert_empty JobInvocation.where(:id => job.id)
   end
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -17,39 +17,39 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
     end
 
     it 'has ssh user in the parameters' do
-      _(host.host_param('remote_execution_ssh_user')).must_equal Setting[:remote_execution_ssh_user]
+      assert_equal Setting[:remote_execution_ssh_user], host.host_param('remote_execution_ssh_user')
     end
 
     it 'can override ssh user' do
       host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_user', :value => 'amy')
-      _(host.host_param('remote_execution_ssh_user')).must_equal 'amy'
+      assert_equal 'amy', host.host_param('remote_execution_ssh_user')
     end
 
     it 'has effective user method in the parameters' do
-      _(host.host_param('remote_execution_effective_user_method')).must_equal Setting[:remote_execution_effective_user_method]
+      assert_equal Setting[:remote_execution_effective_user_method], host.host_param('remote_execution_effective_user_method')
     end
 
     it 'can override effective user method' do
       host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_effective_user_method', :value => 'su')
-      _(host.host_param('remote_execution_effective_user_method')).must_equal 'su'
+      assert_equal 'su', host.host_param('remote_execution_effective_user_method')
     end
 
     it 'has ssh keys in the parameters' do
-      _(host.remote_execution_ssh_keys).must_include sshkey
+      assert_includes host.remote_execution_ssh_keys, sshkey
     end
 
     it 'merges ssh keys from host parameters and proxies' do
       key = 'ssh-rsa not-even-a-key something@somewhere.com'
       host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_keys', :value => [key])
-      _(host.host_param('remote_execution_ssh_keys')).must_include key
-      _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
+      assert_includes host.host_param('remote_execution_ssh_keys'), key
+      assert_includes host.host_param('remote_execution_ssh_keys'), sshkey
     end
 
     it 'merges ssh key as a string from host parameters and proxies' do
       key = 'ssh-rsa not-even-a-key something@somewhere.com'
       host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_keys', :value => key)
-      _(host.host_param('remote_execution_ssh_keys')).must_include key
-      _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
+      assert_includes host.host_param('remote_execution_ssh_keys'), key
+      assert_includes host.host_param('remote_execution_ssh_keys'), sshkey
     end
 
     it 'has ssh keys in the parameters even when no user specified' do
@@ -57,7 +57,7 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       FactoryBot.create(:smart_proxy, :ssh)
       host.interfaces.first.subnet.remote_execution_proxies.clear
       User.current = nil
-      _(host.remote_execution_ssh_keys).must_include sshkey
+      assert_includes host.remote_execution_ssh_keys, sshkey
     end
   end
 
@@ -67,12 +67,12 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
     it 'should only have one execution interface' do
       host.interfaces << FactoryBot.build(:nic_managed)
       host.interfaces.each { |interface| interface.execution = true }
-      _(host).must_be :valid?
-      _(host.interfaces.count(&:execution?)).must_equal 1
+      assert_predicate host, :valid?
+      assert_equal 1, host.interfaces.count(&:execution?)
     end
 
     it 'returns the execution interface' do
-      _(host.execution_interface).must_be_kind_of Nic::Managed
+      assert_kind_of Nic::Managed, host.execution_interface
     end
   end
 
@@ -91,16 +91,16 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
 
     it 'finds hosts for job_invocation.id' do
       found_ids = Host.search_for("job_invocation.id = #{job.id}").map(&:id).sort
-      _(found_ids).must_equal job.template_invocations_host_ids.sort
+      assert_equal job.template_invocations_host_ids.sort, found_ids
     end
 
     it 'finds hosts by job_invocation.result' do
       success, failed = job.template_invocations
                            .partition { |template| template.run_host_job_task.result == 'success' }
       found_ids = Host.search_for('job_invocation.result = success').map(&:id)
-      _(found_ids).must_equal success.map(&:host_id)
+      assert_equal success.map(&:host_id), found_ids
       found_ids = Host.search_for('job_invocation.result = failed').map(&:id)
-      _(found_ids).must_equal failed.map(&:host_id)
+      assert_equal failed.map(&:host_id), found_ids
     end
 
     it 'finds hosts by job_invocation.id and job_invocation.result' do
@@ -108,24 +108,24 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       job
       job2
 
-      _(Host.search_for("job_invocation.id = #{job.id}").count).must_equal 2
-      _(Host.search_for("job_invocation.id = #{job2.id}").count).must_equal 2
-      _(Host.search_for('job_invocation.result = success').count).must_equal 2
-      _(Host.search_for('job_invocation.result = failed').count).must_equal 2
+      assert_equal 2, Host.search_for("job_invocation.id = #{job.id}").count
+      assert_equal 2, Host.search_for("job_invocation.id = #{job2.id}").count
+      assert_equal 2, Host.search_for('job_invocation.result = success').count
+      assert_equal 2, Host.search_for('job_invocation.result = failed').count
 
       success, failed = job.template_invocations
                            .partition { |template| template.run_host_job_task.result == 'success' }
       found_ids = Host.search_for("job_invocation.id = #{job.id} AND job_invocation.result = success").map(&:id)
-      _(found_ids).must_equal success.map(&:host_id)
+      assert_equal success.map(&:host_id), found_ids
       found_ids = Host.search_for("job_invocation.id = #{job.id} AND job_invocation.result = failed").map(&:id)
-      _(found_ids).must_equal failed.map(&:host_id)
+      assert_equal failed.map(&:host_id), found_ids
     end
   end
 
   describe 'proxy determination strategies' do
     context 'subnet strategy' do
       let(:host) { FactoryBot.build(:host, :with_execution) }
-      it { host.remote_execution_proxies(provider)[:subnet].must_include host.subnet.remote_execution_proxies.first }
+      it { assert_includes host.remote_execution_proxies(provider)[:subnet], host.subnet.remote_execution_proxies.first }
     end
 
     context 'fallback strategy' do
@@ -138,7 +138,7 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
         end
 
         it 'returns a fallback proxy' do
-          host.remote_execution_proxies(provider)[:fallback].must_include host.subnet.tftp
+          assert_includes host.remote_execution_proxies(provider)[:fallback], host.subnet.tftp
         end
       end
 
@@ -149,7 +149,7 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
         end
 
         it 'returns no proxy' do
-          host.remote_execution_proxies(provider)[:fallback].must_be_empty
+          assert_empty host.remote_execution_proxies(provider)[:fallback]
         end
       end
     end
@@ -167,15 +167,15 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
         it 'returns correct proxies confined by taxonomies' do
           proxy_in_taxonomies
           proxy_no_taxonomies
-          host.remote_execution_proxies(provider)[:global].must_include proxy_in_taxonomies
-          host.remote_execution_proxies(provider)[:global].wont_include proxy_no_taxonomies
+          assert_includes host.remote_execution_proxies(provider)[:global], proxy_in_taxonomies
+          refute_includes host.remote_execution_proxies(provider)[:global], proxy_no_taxonomies
         end
       end
 
       context 'disabled' do
         before { Setting[:remote_execution_global_proxy] = false }
         it 'returns no proxy' do
-          host.remote_execution_proxies(provider)[:global].must_be_empty
+          assert_empty host.remote_execution_proxies(provider)[:global]
         end
       end
     end
@@ -195,8 +195,8 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
         setup_user('view', 'hosts')
 
         hosts = ::Host::Managed.execution_scope
-        hosts.must_include host
-        hosts.wont_include infra_host
+        assert_includes hosts, host
+        refute_includes hosts, infra_host
       end
     end
 
@@ -204,15 +204,15 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       it 'finds the host as admin' do
         assert User.current.admin?
         hosts = ::Host::Managed.execution_scope
-        hosts.must_include host
-        hosts.must_include infra_host
+        assert_includes hosts, host
+        assert_includes hosts, infra_host
       end
 
       it 'finds the host as user with needed permissions' do
         setup_user('execute_jobs_on', 'infrastructure_hosts')
         hosts = ::Host::Managed.execution_scope
-        hosts.must_include host
-        hosts.must_include infra_host
+        assert_includes hosts, host
+        assert_includes hosts, infra_host
       end
     end
   end

data/test/unit/concerns/nic_extensions_test.rb

@@ -4,6 +4,6 @@ class ForemanRemoteExecutionNicExtensionsTest < ActiveSupport::TestCase
   let(:host) { FactoryBot.create(:host) }
 
   it 'sets the first primary interface as the execution interface' do
-    _(host.execution_interface).must_equal host.interfaces.first
+    assert_equal host.interfaces.first, host.execution_interface
   end
 end

data/test/unit/execution_task_status_mapper_test.rb

@@ -5,11 +5,11 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
     let(:subject) { HostStatus::ExecutionStatus::ExecutionTaskStatusMapper }
 
     it 'accepts status number as well as string representation' do
-      _(subject.sql_conditions_for(HostStatus::ExecutionStatus::ERROR)).must_equal subject.sql_conditions_for('failed')
+      assert_equal subject.sql_conditions_for('failed'), subject.sql_conditions_for(HostStatus::ExecutionStatus::ERROR)
     end
 
     it 'does not find any task for unknown state' do
-      _(subject.sql_conditions_for(-1)).must_equal [ '1 = 0' ]
+      assert_equal [ '1 = 0' ], subject.sql_conditions_for(-1)
     end
   end
 
@@ -22,12 +22,12 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
     describe 'is queued' do
       context 'when there is no task' do
         before { subject.task = nil }
-        specify { _(subject.status).must_equal HostStatus::ExecutionStatus::QUEUED }
+        specify { assert_equal HostStatus::ExecutionStatus::QUEUED, subject.status }
       end
 
       context 'when the task is scheduled in future' do
         before { subject.task.state = 'scheduled' }
-        specify { _(subject.status).must_equal HostStatus::ExecutionStatus::QUEUED }
+        specify { assert_equal HostStatus::ExecutionStatus::QUEUED, subject.status }
       end
     end
 
@@ -37,19 +37,19 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
       describe 'is succeeded' do
         context 'without error' do
           before { subject.task.result = 'success' }
-          specify { _(subject.status).must_equal HostStatus::ExecutionStatus::OK }
+          specify { assert_equal HostStatus::ExecutionStatus::OK, subject.status }
         end
       end
 
       describe 'is failed' do
         context 'with error' do
           before { subject.task.result = 'error' }
-          specify { _(subject.status).must_equal HostStatus::ExecutionStatus::ERROR }
+          specify { assert_equal HostStatus::ExecutionStatus::ERROR, subject.status }
         end
 
         context 'without error but just with warning (sub task failed)' do
           before { subject.task.result = 'warning' }
-          specify { _(subject.status).must_equal HostStatus::ExecutionStatus::ERROR }
+          specify { assert_equal HostStatus::ExecutionStatus::ERROR, subject.status }
         end
       end
     end
@@ -58,7 +58,7 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
       before { subject.task.state = 'running' }
 
       describe 'is pending' do
-        specify { _(subject.status).must_equal HostStatus::ExecutionStatus::RUNNING }
+        specify { assert_equal HostStatus::ExecutionStatus::RUNNING, subject.status }
       end
     end
   end
@@ -73,7 +73,7 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
       end
 
       it 'returns ok label' do
-        _(subject).must_equal HostStatus::ExecutionStatus::STATUS_NAMES[HostStatus::ExecutionStatus::OK]
+        assert_equal HostStatus::ExecutionStatus::STATUS_NAMES[HostStatus::ExecutionStatus::OK], subject
       end
     end
 
@@ -84,7 +84,7 @@ class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
       end
 
       it 'returns failed label' do
-        _(subject).must_equal HostStatus::ExecutionStatus::STATUS_NAMES[HostStatus::ExecutionStatus::ERROR]
+        assert_equal HostStatus::ExecutionStatus::STATUS_NAMES[HostStatus::ExecutionStatus::ERROR], subject
       end
     end
   end