foreman_openscap 0.8.3 → 0.8.4

data/locale/zh_TW/foreman_openscap.po

@@ -17,10 +17,13 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
 
-msgid "%s - The following compliance reports are about to be changed"
+msgid " for policy %s"
 msgstr ""
 
-msgid "%s ago"
+msgid " through %s"
+msgstr ""
+
+msgid "%s - The following compliance reports are about to be changed"
 msgstr ""
 
 msgid "%s compliance report by policy"
@@ -49,6 +52,9 @@ msgstr ""
 msgid "Apply policy to host groups"
 msgstr ""
 
+msgid "Apply policy to hosts"
+msgstr ""
+
 msgid "Assign Compliance Policy"
 msgstr ""
 
@@ -58,7 +64,10 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-msgid "Cannot generate HTML guide for %{scap_content}/%{profile}"
+msgid "Cannot generate HTML guide, no valid OpenSCAP proxy server found."
+msgstr ""
+
+msgid "Cannot generate HTML guide, scap content is missing."
 msgstr ""
 
 msgid "Changed"
@@ -100,6 +109,9 @@ msgstr ""
 msgid "Compliance Status"
 msgstr ""
 
+msgid "Compliance policy summary"
+msgstr ""
+
 msgid "Compliance policy: %s"
 msgstr ""
 
@@ -151,6 +163,9 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
+msgid "Delete compliance policy %s with all of its reports?"
+msgstr ""
+
 msgid "Delete compliance policy %s with all the reports?"
 msgstr ""
 
@@ -163,6 +178,9 @@ msgstr ""
 msgid "Delete tailoring file %s?"
 msgstr ""
 
+msgid "Deleted policy"
+msgstr ""
+
 msgid "Deletes a Tailoring file"
 msgstr ""
 
@@ -172,6 +190,9 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+msgid "Documentation"
+msgstr ""
+
 msgid "Download"
 msgstr ""
 
@@ -226,6 +247,9 @@ msgstr ""
 msgid "Failed to downloaded ARF report in HTML: %s"
 msgstr ""
 
+msgid "Failed to upload Arf Report, no OpenSCAP proxy set for host %s"
+msgstr ""
+
 #. TRANSLATORS: initial character of Failed
 msgid "Failed|F"
 msgstr ""
@@ -275,6 +299,9 @@ msgstr ""
 msgid "Hosts Breakdown"
 msgstr ""
 
+msgid "ID of OpenSCAP Proxy"
+msgstr ""
+
 msgid "In Foreman, a compliance policy checklist is defined via %s."
 msgstr ""
 
@@ -363,7 +390,10 @@ msgstr ""
 msgid "No ARF reports for this policy"
 msgstr ""
 
-msgid "No OpenSCAP proxy found for %{class} with %{id}"
+msgid "No OpenSCAP proxy found for %{class} with id %{id}"
+msgstr ""
+
+msgid "No Tailoring file assigned for policy with id %s"
 msgstr ""
 
 msgid "No available proxy to validate. Returned with error: %s"
@@ -384,6 +414,9 @@ msgstr ""
 msgid "No hosts were found."
 msgstr ""
 
+msgid "No proxy found!"
+msgstr ""
+
 msgid "No proxy with OpenSCAP feature is running."
 msgstr ""
 
@@ -396,9 +429,6 @@ msgstr ""
 msgid "No reports available"
 msgstr ""
 
-msgid "No valid OpenSCAP proxy server found."
-msgstr ""
-
 msgid "No valid policy ID provided"
 msgstr ""
 
@@ -429,10 +459,13 @@ msgstr ""
 msgid "Once SCAP content is present, you can create a policy, assign select host groups and schedule to run."
 msgstr ""
 
-msgid "Openscap Proxy"
+msgid "OpenSCAP Proxy"
 msgstr ""
 
-msgid "Openscap policy summary"
+msgid "OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports"
+msgstr ""
+
+msgid "Openscap Proxy"
 msgstr ""
 
 msgid "Organizations"
@@ -467,6 +500,9 @@ msgstr ""
 msgid "Policies with hosts:"
 msgstr ""
 
+msgid "Policy"
+msgstr ""
+
 msgid "Policy %s"
 msgstr ""
 
@@ -690,9 +726,6 @@ msgstr ""
 msgid "Unknown Compliance status"
 msgstr ""
 
-msgid "Unsupported report status format"
-msgstr ""
-
 msgid "Update a Policy"
 msgstr ""
 
@@ -753,12 +786,18 @@ msgstr ""
 msgid "You can specify custom cron line, e.g. \"0  3  *  *  *\", separate each of 5 values by space"
 msgstr ""
 
+msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
+msgstr ""
+
 msgid "does not come from selected tailoring file"
 msgstr ""
 
 msgid "does not consist of 5 parts separated by space"
 msgstr ""
 
+msgid "does not have the selected SCAP content profile"
+msgstr ""
+
 msgid "invalid type %s"
 msgstr ""
 
@@ -783,5 +822,5 @@ msgstr ""
 msgid "must have Openscap feature"
 msgstr ""
 
-msgid "these Complianace reports"
+msgid "these Compliance reports"
 msgstr ""

data/test/factories/arf_report_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :arf_report, :class => ::ForemanOpenscap::ArfReport do
     host_id 1
     policy nil

data/test/factories/asset_factory.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :asset, :class => ::ForemanOpenscap::Asset do |f|
-    f.assetable_id { FactoryGirl.create(:host).id }
+    f.assetable_id { FactoryBot.create(:host).id }
     f.assetable_type 'Host::Base'
   end
 

data/test/factories/compliance_host_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openscap_feature, :class => Feature do
     name 'Openscap'
   end
@@ -13,7 +13,7 @@ FactoryGirl.define do
     sequence(:name) { |n| "host#{n}" }
     sequence(:hostname) { |n| "hostname#{n}" }
     root_pass 'xybxa6JUkz63w'
-    openscap_proxy { SmartProxy.unscoped.with_features('Openscap').first || FactoryGirl.create(:openscap_proxy) }
+    openscap_proxy { SmartProxy.unscoped.with_features('Openscap').first || FactoryBot.create(:openscap_proxy) }
     policies []
   end
 end

data/test/factories/compliance_log_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :compliance_log, :class => :log do
     result "fail"
     association :report

data/test/factories/policy_arf_report_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :policy_arf_report, :class => ForemanOpenscap::PolicyArfReport do
     policy_id nil
     arf_report_id nil

data/test/factories/policy_factory.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :policy, :class => ::ForemanOpenscap::Policy do
     sequence(:name) { |n| "policy#{n}" }
     period 'weekly'
     weekday 'monday'
-    scap_content { FactoryGirl.create(:scap_content) }
-    scap_content_profile { FactoryGirl.create(:scap_content_profile, :scap_content => scap_content) }
+    scap_content { FactoryBot.create(:scap_content) }
+    scap_content_profile { FactoryBot.create(:scap_content_profile, :scap_content => scap_content) }
     tailoring_file nil
     tailoring_file_profile nil
     day_of_month nil

data/test/factories/scap_content_related.rb

@@ -1,8 +1,8 @@
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :scap_content, :class => ::ForemanOpenscap::ScapContent do |f|
-    f.title 'fedora'
+    f.sequence(:title) { |n| "scap_content_title_#{n}" }
     f.original_filename 'fedora ds'
     f.scap_file { File.new("#{ForemanOpenscap::Engine.root}/test/files/scap_contents/ssg-fedora-ds.xml", 'rb').read }
   end

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -8,18 +8,16 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     Message.delete_all
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
-    @host = FactoryGirl.create(:compliance_host)
-    @report = FactoryGirl.create(:arf_report,
-                                 :host_id => @host.id,
-                                 :openscap_proxy => FactoryGirl.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
-    @policy = FactoryGirl.create(:policy)
-    @asset = FactoryGirl.create(:asset)
+    @host = FactoryBot.create(:compliance_host)
+    @policy = FactoryBot.create(:policy)
+    @asset = FactoryBot.create(:asset, :assetable_id => @host.id)
 
     @from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.json"
     @cname = '9521a5c5-8f44-495f-b087-20e86b30bf67'
   end
 
   test "should get index" do
+    create_arf_report
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert_not response['results'].empty?
@@ -27,7 +25,8 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should get show" do
-    get :show, { :id => @report.to_param }, set_session_user
+    report = create_arf_report
+    get :show, { :id => report.to_param }, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     refute response['passed'].blank?
     refute response['failed'].blank?
@@ -36,9 +35,10 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should download report" do
+    report = create_arf_report
     bzipped_report = File.read "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.bz2"
     ForemanOpenscap::ArfReport.any_instance.stubs(:to_bzip).returns(bzipped_report)
-    get :download, { :id => @report.to_param }, set_session_user
+    get :download, { :id => report.to_param }, set_session_user
     t = Tempfile.new('tmp_report')
     t.write @response.body
     t.close
@@ -63,6 +63,20 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_equal msg_count, src_count
   end
 
+  test "should not create report for host without proxy" do
+    asset = FactoryBot.create(:asset)
+    date = Time.new(1944, 6, 6)
+    ForemanOpenscap::Helper.stubs(:get_asset).returns(asset)
+    post :create,
+         @from_json.merge(:cname => @cname,
+                          :policy_id => @policy.id,
+                          :date => date.to_i),
+         set_session_user
+    assert_response :unprocessable_entity
+    res = JSON.parse(@response.body)
+    assert_equal "Failed to upload Arf Report, no OpenSCAP proxy set for host #{asset.host.name}", res["result"]
+  end
+
   test "should not duplicate messages" do
     dates = [Time.new(1984, 9, 15), Time.new(1932, 3, 27)]
     params = @from_json.with_indifferent_access.merge(:cname => @cname,
@@ -70,7 +84,6 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
                                                       :date => dates[0].to_i)
     assert ForemanOpenscap::ArfReport.create_arf(@asset, params)
 
-
     ForemanOpenscap::Helper.stubs(:get_asset).returns(@asset)
     post :create,
          @from_json.merge(:cname => @cname,
@@ -147,4 +160,10 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     file_content = File.read path
     JSON.parse file_content
   end
+
+  def create_arf_report
+    FactoryBot.create(:arf_report,
+                      :host_id => @host.id,
+                      :openscap_proxy => FactoryBot.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
+  end
 end

data/test/functional/api/v2/compliance/policies_controller_test.rb

@@ -3,16 +3,16 @@ require 'test_plugin_helper'
 class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   setup do
     ::ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-    @scap_content_profile = FactoryGirl.create(:scap_content_profile)
+    @scap_content_profile = FactoryBot.create(:scap_content_profile)
     @attributes = { :policy => { :name => 'my_policy',
                                  :scap_content_profile_id => @scap_content_profile.id,
                                  :scap_content_id => @scap_content_profile.scap_content_id,
                                  :period => 'weekly',
-                                 :weekday => 'friday' }}
+                                 :weekday => 'friday' } }
   end
 
   test "should get index" do
-    FactoryGirl.create(:policy)
+    FactoryBot.create(:policy)
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert !response['results'].empty?
@@ -20,7 +20,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should show a policy" do
-    policy = FactoryGirl.create(:policy)
+    policy = FactoryBot.create(:policy)
     get :show, { :id => policy.to_param }, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert response['name'], policy.name
@@ -28,16 +28,16 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should update a policy" do
-    policy = FactoryGirl.create(:policy)
-    put :update, { :id => policy.id, :policy => { :period => 'monthly', :day_of_month => 15 }}
+    policy = FactoryBot.create(:policy)
+    put :update, { :id => policy.id, :policy => { :period => 'monthly', :day_of_month => 15 } }
     updated_policy = ActiveSupport::JSON.decode(@response.body)
     assert(updated_policy['period'], 'monthly')
     assert_response :ok
   end
 
   test "should not update invalid" do
-    policy = FactoryGirl.create(:policy)
-    put :update, {:id => policy.id, :policy => {:name => ''}}
+    policy = FactoryBot.create(:policy)
+    put :update, { :id => policy.id, :policy => { :name => '' } }
     assert_response :unprocessable_entity
   end
 
@@ -49,7 +49,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should not create a policy with tailoring file profile and without the actual file" do
-    tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_profile')
+    tailoring_profile = FactoryBot.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_profile')
     @attributes[:policy][:tailoring_file_profile_id] = tailoring_profile.id
     post :create, @attributes, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
@@ -58,7 +58,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should not create a policy with tailoring file and without tailoring profile" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
+    tailoring_file = FactoryBot.create(:tailoring_file)
     @attributes[:policy][:tailoring_file_id] = tailoring_file.id
     post :create, @attributes, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
@@ -72,30 +72,30 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
   end
 
   test "should destroy" do
-    policy = FactoryGirl.create(:policy)
+    policy = FactoryBot.create(:policy)
     delete :destroy, { :id => policy.id }, set_session_user
     assert_response :ok
     refute ForemanOpenscap::Policy.exists?(policy.id)
   end
 
   test "should return xml of scap content" do
-    policy = FactoryGirl.create(:policy)
+    policy = FactoryBot.create(:policy)
     get :content, { :id => policy.id }, set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
 
   test "should return xml of a tailoring file" do
-    tailoring_profile = FactoryGirl.create(:scap_content_profile)
-    policy = FactoryGirl.create(:policy, :tailoring_file => FactoryGirl.create(:tailoring_file, :scap_content_profiles => [tailoring_profile]),
-                                         :tailoring_file_profile => tailoring_profile)
+    tailoring_profile = FactoryBot.create(:scap_content_profile)
+    policy = FactoryBot.create(:policy, :tailoring_file => FactoryBot.create(:tailoring_file, :scap_content_profiles => [tailoring_profile]),
+                                        :tailoring_file_profile => tailoring_profile)
     get :tailoring, { :id => policy.id }, set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
 
   test "should return meaningufull error when no tailioring file assigned" do
-    policy = FactoryGirl.create(:policy)
+    policy = FactoryBot.create(:policy)
     get :tailoring, { :id => policy.id }, set_session_user
     assert_response :not_found
     response = ActiveSupport::JSON.decode(@response.body)

data/test/functional/api/v2/compliance/scap_contents_controller_test.rb

@@ -1,9 +1,8 @@
 require 'test_plugin_helper'
 
 class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCase
-
   test "should get index" do
-    FactoryGirl.create(:scap_content)
+    FactoryBot.create(:scap_content)
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert response['results'].any?
@@ -11,7 +10,7 @@ class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCa
   end
 
   test "should return xml of scap content" do
-    scap_content = FactoryGirl.create(:scap_content)
+    scap_content = FactoryBot.create(:scap_content)
     get :show, { :id => scap_content.id }, set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
@@ -27,22 +26,22 @@ class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCa
   end
 
   test "should update scap content" do
-    scap_content = FactoryGirl.create(:scap_content)
-    put :update, { :id => scap_content.id, :scap_content => {:title => 'RHEL7 SCAP'}}, set_session_user
+    scap_content = FactoryBot.create(:scap_content)
+    put :update, { :id => scap_content.id, :scap_content => { :title => 'RHEL7 SCAP' } }, set_session_user
     assert_response :success
     assert scap_content.title, 'RHEL7 SCAP'
   end
 
   test "should not update invalid scap content" do
     skip("Solve 'ActiveRecord::RecordInvalid' error")
-    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_content).returns({'errors' => ['Invalid file']})
-    scap_content = FactoryGirl.create(:scap_content)
-    put :update, { :id => scap_content.id, :scap_content => {:scap_file => '<xml>blah</xml>'}}, set_session_user
+    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_content).returns({ 'errors' => ['Invalid file'] })
+    scap_content = FactoryBot.create(:scap_content)
+    put :update, { :id => scap_content.id, :scap_content => { :scap_file => '<xml>blah</xml>' } }, set_session_user
     assert_response :unprocessable_entity
   end
 
   test "should destory scap content" do
-    scap_content = FactoryGirl.create(:scap_content)
+    scap_content = FactoryBot.create(:scap_content)
     delete :destroy, { :id => scap_content.id }, set_session_user
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(scap_content.id)

data/test/functional/api/v2/compliance/tailoring_files_controller_test.rb

@@ -1,9 +1,8 @@
 require 'test_plugin_helper'
 
 class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::TestCase
-
   test "should get index" do
-    FactoryGirl.create(:tailoring_file)
+    FactoryBot.create(:tailoring_file)
     get :index, {}, set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert response['results'].any?
@@ -11,7 +10,7 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   end
 
   test "should return xml of tailoring_file" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
+    tailoring_file = FactoryBot.create(:tailoring_file)
     get :show, { :id => tailoring_file.id }, set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
@@ -23,7 +22,7 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   end
 
   test "should create tailoring_file" do
-    tf = FactoryGirl.build(:tailoring_file)
+    tf = FactoryBot.build(:tailoring_file)
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
     ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
                                               .returns({})
@@ -32,28 +31,28 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   end
 
   test "should update tailoring_file" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
-    put :update, { :id => tailoring_file.id, :tailoring_file => { :name => 'RHEL7 SCAP' }}, set_session_user
+    tailoring_file = FactoryBot.create(:tailoring_file)
+    put :update, { :id => tailoring_file.id, :tailoring_file => { :name => 'RHEL7 SCAP' } }, set_session_user
     assert_response :success
     assert tailoring_file.name, 'RHEL7 SCAP'
   end
 
   test "should not update invalid tailoring_file" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
-    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({'errors' => ['Invalid file']})
-    put :update, { :id => tailoring_file.id, :tailoring_file => { :scap_file => '<xml>blah</xml>' }}, set_session_user
+    tailoring_file = FactoryBot.create(:tailoring_file)
+    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({ 'errors' => ['Invalid file'] })
+    put :update, { :id => tailoring_file.id, :tailoring_file => { :scap_file => '<xml>blah</xml>' } }, set_session_user
     assert_response :unprocessable_entity
   end
 
   test "should destory tailoring_file" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
+    tailoring_file = FactoryBot.create(:tailoring_file)
     delete :destroy, { :id => tailoring_file.id }, set_session_user
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(tailoring_file.id)
   end
 
   test "should not create tailoring file when there is outdated proxy version" do
-    tf = FactoryGirl.build(:tailoring_file)
+    tf = FactoryBot.build(:tailoring_file)
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
     ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
                                               .returns('test-proxy' => '0.5.4')

data/test/functional/arf_reports_controller_test.rb

@@ -4,12 +4,12 @@ class ArfReportsControllerTest < ActionController::TestCase
   setup do
     ForemanOpenscap::Helper.stubs(:find_name_or_uuid_by_host)
     ::ProxyAPI::Openscap.any_instance.stubs(:destroy_report).returns(true)
-    @host = FactoryGirl.create(:compliance_host)
+    @host = FactoryBot.create(:compliance_host)
   end
 
   test "should delete arf report" do
     ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy).returns(@host.openscap_proxy)
-    arf_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    arf_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     assert_difference("ForemanOpenscap::ArfReport.count", -1) do
       delete :destroy, { :id => arf_report.id }, set_session_user
     end
@@ -20,7 +20,7 @@ class ArfReportsControllerTest < ActionController::TestCase
     ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy).returns(@host.openscap_proxy)
     arf_reports = []
     3.times do
-      arf_reports << FactoryGirl.create(:arf_report, :host_id => @host.id)
+      arf_reports << FactoryBot.create(:arf_report, :host_id => @host.id)
     end
     last_arf = arf_reports[-1]
     assert_difference("ForemanOpenscap::ArfReport.unscoped.count", -2) do
@@ -31,7 +31,7 @@ class ArfReportsControllerTest < ActionController::TestCase
   end
 
   test "should download arf report as html" do
-    arf_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    arf_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     report_html = File.read("#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.html")
     ForemanOpenscap::ArfReport.any_instance.stubs(:to_html).returns(report_html)
     get :download_html, { :id => arf_report.id }, set_session_user

data/test/functional/openscap_proxies_controller_test.rb

@@ -1,14 +1,16 @@
 require 'test_plugin_helper'
+require 'application_helper'
 
 class OpenscapProxiesControllerTest < ActionController::TestCase
   include ActionView::Helpers::DateHelper
+  include ApplicationHelper
 
   test "should render spool error" do
-    spool_error = { "timestamp" => 1_487_144_633.951_368, "level" => "ERROR", "message"=> "Failed to parse Arf Report in test" }
+    spool_error = { "timestamp" => 1_487_144_633.951_368, "level" => "ERROR", "message" => "Failed to parse Arf Report in test" }
     OpenscapProxiesController.any_instance.stubs(:find_spool_error).returns(spool_error)
-    proxy = FactoryGirl.create(:openscap_proxy)
+    proxy = FactoryBot.create(:openscap_proxy)
     get :openscap_spool, { :id => proxy.id }, set_session_user
     assert_template :partial => 'smart_proxies/_openscap_spool'
-    assert @response.body.match(time_ago_in_words(Time.at(spool_error["timestamp"])))
+    assert @response.body.match(date_time_relative_value(Time.at(spool_error["timestamp"])))
   end
 end

data/test/functional/tailoring_files_controller_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class TailoringFilesControllerTest < ActionController::TestCase
   setup do
-    @tailoring_file = FactoryGirl.create(:tailoring_file)
+    @tailoring_file = FactoryBot.create(:tailoring_file)
     @scap_file = File.new("#{ForemanOpenscap::Engine.root}/test/files/tailoring_files/ssg-firefox-ds-tailoring.xml", 'rb')
   end
 

data/test/test_plugin_helper.rb

@@ -1,9 +1,9 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload
 
 module ScapClientPuppetclass
   def skip_scap_callback
@@ -17,15 +17,15 @@ module ScapTestProxy
   private
 
   def add_smart_proxy
-    FactoryGirl.create(:smart_proxy, :url => 'http://localhost:8443', :features => [FactoryGirl.create(:feature, :name => 'Openscap')])
+    FactoryBot.create(:smart_proxy, :url => 'http://localhost:8443', :features => [FactoryBot.create(:feature, :name => 'Openscap')])
     ProxyAPI::Features.any_instance.stubs(:features).returns(%w[puppet openscap])
     versions = { "version" => "1.11.0", "modules" => { "openscap" => "0.5.3" } }
     ProxyAPI::Version.any_instance.stubs(:proxy_versions).returns(versions)
-    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({'errors' => []})
+    ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({ 'errors' => [] })
     ProxyAPI::Openscap.any_instance.stubs(:fetch_policies_for_scap_content)
-                      .returns({'xccdf_org.ssgproject.content_profile_common' => 'Common Profile for General-Purpose Fedora Systems'})
+                      .returns({ 'xccdf_org.ssgproject.content_profile_common' => 'Common Profile for General-Purpose Fedora Systems' })
     ProxyAPI::Openscap.any_instance.stubs(:fetch_profiles_for_tailoring_file)
-                      .returns({'xccdf_org.ssgproject.test_profile_common' => 'Stubbed test profile'})
+                      .returns({ 'xccdf_org.ssgproject.test_profile_common' => 'Stubbed test profile' })
   end
 end