foreman_openscap 0.8.3 → 0.8.4

data/test/unit/arf_report_status_calculator_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ArfReportStatusCalculatorTest < ActiveSupport::TestCase
-
   test 'it should save metrics as bits' do
     calc = ForemanOpenscap::ArfReportStatusCalculator.new(:counters => { 'passed' => 25, 'othered' => 1024, 'failed' => 10 })
     assert_equal 25, calc.status['passed']

data/test/unit/arf_report_test.rb

@@ -6,85 +6,85 @@ module ForemanOpenscap
       disable_orchestration
       User.current = users :admin
       ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-      @policy = FactoryGirl.create(:policy)
-      @asset = FactoryGirl.create(:asset)
-      @host = FactoryGirl.create(:compliance_host)
-      @failed_source = FactoryGirl.create(:source)
-      @passed_source = FactoryGirl.create(:source)
-      @log_1 = FactoryGirl.create(:compliance_log, :result => "pass", :source => @passed_source)
-      @log_2 = FactoryGirl.create(:compliance_log, :result => "fail", :source => @failed_source)
-      @log_3 = FactoryGirl.create(:compliance_log, :result => "pass", :source => @passed_source)
-      @status = {:passed => 5, :failed => 1, :othered => 7}.with_indifferent_access
+      @policy = FactoryBot.create(:policy)
+      @asset = FactoryBot.create(:asset)
+      @host = FactoryBot.create(:compliance_host)
+      @failed_source = FactoryBot.create(:source)
+      @passed_source = FactoryBot.create(:source)
+      @log_1 = FactoryBot.create(:compliance_log, :result => "pass", :source => @passed_source)
+      @log_2 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
+      @log_3 = FactoryBot.create(:compliance_log, :result => "pass", :source => @passed_source)
+      @status = { :passed => 5, :failed => 1, :othered => 7 }.with_indifferent_access
     end
 
     test 'equal? should return true when there is no change in report results' do
-      log_4 = FactoryGirl.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
+      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
       assert(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when there is change in report results' do
-      new_source = FactoryGirl.create(:source)
-      log_4 = FactoryGirl.build(:compliance_log, :result => "pass", :source => new_source)
-      report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
+      new_source = FactoryBot.create(:source)
+      log_4 = FactoryBot.build(:compliance_log, :result => "pass", :source => new_source)
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different sets of rules' do
-      report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3])
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different hosts' do
-      host = FactoryGirl.create(:compliance_host)
-      log_4 = FactoryGirl.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => host.id, :logs => [@log_3, log_4])
+      host = FactoryBot.create(:compliance_host)
+      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => host.id, :logs => [@log_3, log_4])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different policies' do
-      policy = FactoryGirl.create(:policy)
-      log_4 = FactoryGirl.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryGirl.create(:arf_report, :policy => policy, :host_id => @host.id, :logs => [@log_3, log_4])
+      policy = FactoryBot.create(:policy)
+      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report_2 = FactoryBot.create(:arf_report, :policy => policy, :host_id => @host.id, :logs => [@log_3, log_4])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'should recognize report that failed' do
-      report = FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
+      report = FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
       assert report.failed?
     end
 
     test 'should recognize report that othered' do
       @status[:failed] = 0
-      report = FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
+      report = FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
       assert report.othered?
     end
 
     test 'should recognize report that passed' do
       @status[:failed] = 0
       @status[:othered] = 0
-      report = FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
+      report = FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
       assert report.passed?
     end
 
     test 'should return latest report for each of the hosts' do
       reports = []
-      host = FactoryGirl.create(:compliance_host)
+      host = FactoryBot.create(:compliance_host)
       5.times do
-        reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id)
-        reports << FactoryGirl.create(:arf_report, :host_id => host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id)
+        reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id)
+        reports << FactoryBot.create(:arf_report, :host_id => host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id)
       end
       assert ForemanOpenscap::ArfReport.latest.to_a.include? reports[-2]
       assert ForemanOpenscap::ArfReport.latest.to_a.include? reports[-1]
@@ -92,20 +92,20 @@ module ForemanOpenscap
 
     test 'should return latest report of policy for each of the hosts' do
       reports = []
-      host = FactoryGirl.create(:compliance_host)
-      policy = FactoryGirl.create(:policy)
+      host = FactoryBot.create(:compliance_host)
+      policy = FactoryBot.create(:policy)
       3.times do
-        reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => @policy.id)
+        reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => @policy.id)
 
-        reports << FactoryGirl.create(:arf_report, :host_id => host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => @policy.id)
+        reports << FactoryBot.create(:arf_report, :host_id => host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => @policy.id)
 
-        reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => policy.id)
+        reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => policy.id)
 
-        reports << FactoryGirl.create(:arf_report, :host_id => host.id, :status => @status)
-        FactoryGirl.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => policy.id)
+        reports << FactoryBot.create(:arf_report, :host_id => host.id, :status => @status)
+        FactoryBot.create(:policy_arf_report, :arf_report_id => reports.last.id, :policy_id => policy.id)
       end
 
       assert ForemanOpenscap::ArfReport.latest_of_policy(policy).include? reports[-1]
@@ -118,15 +118,15 @@ module ForemanOpenscap
 
     context 'retrieving reports by status' do
       setup do
-        @passed_status = {:passed => 5, :failed => 0, :othered => 0}.with_indifferent_access
-        @othered_status = {:passed => 5, :failed => 0, :othered => 3}.with_indifferent_access
+        @passed_status = { :passed => 5, :failed => 0, :othered => 0 }.with_indifferent_access
+        @othered_status = { :passed => 5, :failed => 0, :othered => 3 }.with_indifferent_access
         @failed_reports = []
         @othered_reports = []
         @passed_reports = []
         3.times do
-          @failed_reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @status)
-          @passed_reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @passed_status)
-          @othered_reports << FactoryGirl.create(:arf_report, :host_id => @host.id, :status => @othered_status)
+          @failed_reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @status)
+          @passed_reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @passed_status)
+          @othered_reports << FactoryBot.create(:arf_report, :host_id => @host.id, :status => @othered_status)
         end
       end
 
@@ -151,7 +151,7 @@ module ForemanOpenscap
       openscap_proxy_api.stubs(:destroy_report).returns(true)
       ForemanOpenscap::Helper.stubs(:find_name_or_uuid_by_host).returns("abcde")
       ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy_api).returns(openscap_proxy_api)
-      report = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
       report.destroy
       refute ForemanOpenscap::ArfReport.all.include? report
     end

data/test/unit/compliance_status_test.rb

@@ -5,22 +5,22 @@ class ComplianceStatusTest < ActiveSupport::TestCase
     disable_orchestration
     User.current = users :admin
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-    @policy_a = FactoryGirl.create(:policy)
-    @policy_b = FactoryGirl.create(:policy)
-    @host = FactoryGirl.create(:compliance_host)
-    @failed_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    @policy_a = FactoryBot.create(:policy)
+    @policy_b = FactoryBot.create(:policy)
+    @host = FactoryBot.create(:compliance_host)
+    @failed_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     @failed_report.stubs(:failed?).returns(true)
-    @passed_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    @passed_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     @passed_report.stubs(:failed?).returns(false)
     @passed_report.stubs(:othered?).returns(false)
-    @othered_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    @othered_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     @othered_report.stubs(:failed?).returns(false)
     @othered_report.stubs(:othered?).returns(true)
   end
 
   test 'status should be incompliant' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a])
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a])
     status.host = host
     host.stubs(:last_report_for_policy).returns(@failed_report)
     status.to_status
@@ -29,7 +29,7 @@ class ComplianceStatusTest < ActiveSupport::TestCase
 
   test 'status should be inconclusive' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a])
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a])
     host.stubs(:last_report_for_policy).returns(@othered_report)
     status.host = host
     assert_equal 1, status.to_status
@@ -37,7 +37,7 @@ class ComplianceStatusTest < ActiveSupport::TestCase
 
   test 'status should be compliant' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a])
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a])
     host.stubs(:last_report_for_policy).returns(@passed_report)
     status.host = host
     assert_equal 0, status.to_status
@@ -45,7 +45,7 @@ class ComplianceStatusTest < ActiveSupport::TestCase
 
   test 'status should be incompliant for multiple policies' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a, @policy_b])
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a, @policy_b])
     status.host = host
     host.stubs(:last_report_for_policy).returns(@failed_report, @passed_report)
     assert_equal 2, status.to_status
@@ -53,7 +53,7 @@ class ComplianceStatusTest < ActiveSupport::TestCase
 
   test 'status should be inconclusive for multiple policies' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a, @policy_b])
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a, @policy_b])
     host.stubs(:last_report_for_policy).returns(@othered_report, @passed_report)
     status.host = host
     assert_equal 1, status.to_status
@@ -61,8 +61,8 @@ class ComplianceStatusTest < ActiveSupport::TestCase
 
   test 'status should be compliant for multiple policies' do
     status = ForemanOpenscap::ComplianceStatus.new
-    host = FactoryGirl.create(:compliance_host, :policies => [@policy_a, @policy_b])
-    passed_report = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    host = FactoryBot.create(:compliance_host, :policies => [@policy_a, @policy_b])
+    passed_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     passed_report.stubs(:othered?).returns(false)
     passed_report.stubs(:failed?).returns(false)
     host.stubs(:last_report_for_policy).returns(passed_report, @passed_report)

data/test/unit/concerns/host_extensions_test.rb

@@ -3,10 +3,10 @@ require 'test_plugin_helper'
 class HostExtensionsTest < ActiveSupport::TestCase
   setup do
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-    @scap_content = FactoryGirl.create(:scap_content)
-    @scap_content_profile = FactoryGirl.create(:scap_content_profile, :scap_content => @scap_content)
-    @policy = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_content_profile)
-    @host = FactoryGirl.create(:compliance_host, :policies => [@policy])
+    @scap_content = FactoryBot.create(:scap_content)
+    @scap_content_profile = FactoryBot.create(:scap_content_profile, :scap_content => @scap_content)
+    @policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_content_profile)
+    @host = FactoryBot.create(:compliance_host, :policies => [@policy])
   end
 
   test "should have download_path in enc without digest" do
@@ -25,8 +25,8 @@ class HostExtensionsTest < ActiveSupport::TestCase
 
   test "should find hosts with direct policy assignment that were never audited" do
     policy, host, host_2 = setup_hosts_with_policy.values_at(:policy, :host, :host_2)
-    report = FactoryGirl.create(:arf_report, :host_id => host_2.id)
-    FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+    report = FactoryBot.create(:arf_report, :host_id => host_2.id)
+    FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
 
     res = Host.policy_reports_missing policy
     assert_equal res.count, 1
@@ -35,8 +35,8 @@ class HostExtensionsTest < ActiveSupport::TestCase
 
   test "should find hosts with inherited policy that were never audited" do
     policy, host, host_2 = setup_hosts_with_inherited_policy.values_at(:policy, :host, :host_2)
-    report = FactoryGirl.create(:arf_report, :host_id => host_2.id)
-    FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+    report = FactoryBot.create(:arf_report, :host_id => host_2.id)
+    FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
 
     res = Host.policy_reports_missing policy
     assert_equal res.count, 1
@@ -59,27 +59,43 @@ class HostExtensionsTest < ActiveSupport::TestCase
     assert_include res, host_2
   end
 
+  test "should find hosts with directly assigned policy when searching by policy id" do
+    policy, host, host_2 = setup_hosts_with_policy.values_at(:policy, :host, :host_2)
+    res = Host.search_for "compliance_policy_id = #{policy.id}"
+    assert_equal 2, res.count
+    assert_include res, host
+    assert_include res, host_2
+  end
+
+  test "should find hosts with inherited policy when searching by policy id" do
+    policy, host, host_2 = setup_hosts_with_inherited_policy.values_at(:policy, :host, :host_2)
+    res = Host.search_for "compliance_policy_id = #{policy.id}"
+    assert_equal 2, res.count
+    assert_include res, host
+    assert_include res, host_2
+  end
+
   private
 
   def setup_hosts_with_policy
-    policy = FactoryGirl.create(:policy)
-    host = FactoryGirl.create(:compliance_host)
-    host_2 = FactoryGirl.create(:compliance_host)
-    asset = FactoryGirl.create(:asset, :assetable_id => host.id, :assetable_type => 'Host::Base')
-    asset_2 = FactoryGirl.create(:asset, :assetable_id => host_2.id, :assetable_type => 'Host::Base')
-    FactoryGirl.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
-    FactoryGirl.create(:asset_policy, :asset_id => asset_2.id, :policy_id => policy.id)
+    policy = FactoryBot.create(:policy)
+    host = FactoryBot.create(:compliance_host)
+    host_2 = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host.id, :assetable_type => 'Host::Base')
+    asset_2 = FactoryBot.create(:asset, :assetable_id => host_2.id, :assetable_type => 'Host::Base')
+    FactoryBot.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
+    FactoryBot.create(:asset_policy, :asset_id => asset_2.id, :policy_id => policy.id)
     { :host => host, :policy => policy, :host_2 => host_2 }
   end
 
   def setup_hosts_with_inherited_policy
-    policy = FactoryGirl.create(:policy)
-    parent = FactoryGirl.create(:hostgroup)
-    child = FactoryGirl.create(:hostgroup, :ancestry => parent.id.to_s)
-    asset = FactoryGirl.create(:asset, :assetable_id => parent.id, :assetable_type => 'Hostgroup')
-    FactoryGirl.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
-    host = FactoryGirl.create(:compliance_host, :hostgroup_id => child.id)
-    host_2 = FactoryGirl.create(:compliance_host, :hostgroup_id => child.id)
+    policy = FactoryBot.create(:policy)
+    parent = FactoryBot.create(:hostgroup)
+    child = FactoryBot.create(:hostgroup, :ancestry => parent.id.to_s)
+    asset = FactoryBot.create(:asset, :assetable_id => parent.id, :assetable_type => 'Hostgroup')
+    FactoryBot.create(:asset_policy, :asset_id => asset.id, :policy_id => policy.id)
+    host = FactoryBot.create(:compliance_host, :hostgroup_id => child.id)
+    host_2 = FactoryBot.create(:compliance_host, :hostgroup_id => child.id)
     { :policy => policy, :host => host, :host_2 => host_2 }
   end
 end

data/test/unit/concerns/openscap_proxy_extenstions_test.rb

@@ -1,21 +1,20 @@
 require 'test_plugin_helper'
 
 class OpenscapProxyExtensionsTest < ActiveSupport::TestCase
-
   setup do
-    @host = FactoryGirl.create(:compliance_host)
+    @host = FactoryBot.create(:compliance_host)
   end
 
   test "should return proxy api for openscap" do
-    arf = FactoryGirl.create(:arf_report,
-                             :host_id => @host.id,
-                             :openscap_proxy => @host.openscap_proxy)
+    arf = FactoryBot.create(:arf_report,
+                            :host_id => @host.id,
+                            :openscap_proxy => @host.openscap_proxy)
     api = arf.openscap_proxy_api
     assert_equal (@host.openscap_proxy.url + "/compliance/"), api.url
   end
 
   test "should raise exception when no openscap proxy asociated" do
-    arf = FactoryGirl.create(:arf_report, :host_id => @host.id)
+    arf = FactoryBot.create(:arf_report, :host_id => @host.id)
     assert_raises(Foreman::Exception) { arf.openscap_proxy_api }
   end
 end

data/test/unit/message_cleaner_test.rb

@@ -6,15 +6,15 @@ class MessageCleanerTest < ActiveSupport::TestCase
   end
 
   test "should clean up messages" do
-    host = FactoryGirl.create(:compliance_host)
-    policy = FactoryGirl.create(:policy)
+    host = FactoryBot.create(:compliance_host)
+    policy = FactoryBot.create(:policy)
     reports = []
-    source = FactoryGirl.create(:source, :value => "xccdf_org.ssgproject.content_rule_firefox_preferences-lock_settings_obscure")
+    source = FactoryBot.create(:source, :value => "xccdf_org.ssgproject.content_rule_firefox_preferences-lock_settings_obscure")
     2.times do
-      report = FactoryGirl.create(:arf_report, :host_id => host.id)
-      message = FactoryGirl.create(:compliance_message, :value => "Disable Firefox Configuration File ROT-13 Encoding")
-      FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
-      FactoryGirl.create(:compliance_log, :source_id => source.id, :message_id => message.id, :report_id => report.id)
+      report = FactoryBot.create(:arf_report, :host_id => host.id)
+      message = FactoryBot.create(:compliance_message, :value => "Disable Firefox Configuration File ROT-13 Encoding")
+      FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+      FactoryBot.create(:compliance_log, :source_id => source.id, :message_id => message.id, :report_id => report.id)
       report.reload
       reports << report
     end

data/test/unit/openscap_host_test.rb

@@ -5,12 +5,12 @@ class OpenscapHostTest < ActiveSupport::TestCase
     disable_orchestration
     User.current = users :admin
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryGirl.create(:puppetclass, :name => 'foreman_scap_client'))
-    @policy = FactoryGirl.create(:policy)
+    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
+    @policy = FactoryBot.create(:policy)
   end
 
   test 'Host has policy' do
-    host = FactoryGirl.create(:host)
+    host = FactoryBot.create(:host)
     assert_empty(host.policies)
 
     assert(@policy.assign_hosts([host]), 'Host policies should be assigned')
@@ -18,19 +18,19 @@ class OpenscapHostTest < ActiveSupport::TestCase
   end
 
   test 'Host has policies via its hostgroup' do
-    host = FactoryGirl.create(:host, :with_hostgroup)
+    host = FactoryBot.create(:host, :with_hostgroup)
     hostgroup = host.hostgroup
-    @policy.hostgroup_ids = [ hostgroup.id ]
+    @policy.hostgroup_ids = [hostgroup.id]
     assert @policy.save
     refute_empty(host.combined_policies)
     assert_includes(host.combined_policies, @policy)
   end
 
   test 'Host has policies via its host group and its parent host groups' do
-    host = FactoryGirl.create(:host, :with_hostgroup)
+    host = FactoryBot.create(:host, :with_hostgroup)
     hostgroup = host.hostgroup
-    hostgroup.parent = FactoryGirl.create(:hostgroup)
-    @policy.hostgroup_ids = [ hostgroup.parent.id ]
+    hostgroup.parent = FactoryBot.create(:hostgroup)
+    @policy.hostgroup_ids = [hostgroup.parent.id]
     assert @policy.save
     refute_empty(host.combined_policies)
     assert_includes(host.combined_policies, @policy)
@@ -38,11 +38,11 @@ class OpenscapHostTest < ActiveSupport::TestCase
 
   context 'testing scap_status_changed?' do
     setup do
-      @host = FactoryGirl.create(:compliance_host)
-      @report_1 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id)
-      @report_2 = FactoryGirl.create(:arf_report, :policy => @policy, :host_id => @host.id)
-      @policy_report_1 = FactoryGirl.create(:policy_arf_report, :policy_id => @policy.id, :arf_report_id => @report_1.id)
-      @policy_report_2 = FactoryGirl.create(:policy_arf_report, :policy_id => @policy.id, :arf_report_id => @report_2.id)
+      @host = FactoryBot.create(:compliance_host)
+      @report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      @report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      @policy_report_1 = FactoryBot.create(:policy_arf_report, :policy_id => @policy.id, :arf_report_id => @report_1.id)
+      @policy_report_2 = FactoryBot.create(:policy_arf_report, :policy_id => @policy.id, :arf_report_id => @report_2.id)
     end
 
     test "reports for policy should return expected reports" do

data/test/unit/policy_mailer_test.rb

@@ -4,19 +4,19 @@ class PolicyMailerTest < ActiveSupport::TestCase
   setup do
     @user = User.current = users :admin
 
-    FactoryGirl.create(:mail_notification,
-                       :name => :openscap_policy_summary,
-                       :description => N_('A summary of reports for OpenScap policies'),
-                       :mailer => 'ForemanOpenscap::PolicyMailer',
-                       :method => 'policy_summary',
-                       :subscription_type => 'report',)
-    #just to have some content to send
+    FactoryBot.create(:mail_notification,
+                      :name => :openscap_policy_summary,
+                      :description => N_('A summary of reports for OpenScap policies'),
+                      :mailer => 'ForemanOpenscap::PolicyMailer',
+                      :method => 'policy_summary',
+                      :subscription_type => 'report',)
+    # just to have some content to send
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
-    host = FactoryGirl.create(:compliance_host)
-    asset = FactoryGirl.create(:asset, :assetable_id => host.id)
-    policy = FactoryGirl.create(:policy, :assets => [asset])
-    arf_report = FactoryGirl.create(:arf_report, :policy => policy, :host_id => host.id)
-    policy_arf_report = FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
+    host = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host.id)
+    policy = FactoryBot.create(:policy, :assets => [asset])
+    arf_report = FactoryBot.create(:arf_report, :policy => policy, :host_id => host.id)
+    policy_arf_report = FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
 
     @user.mail_notifications << MailNotification[:openscap_policy_summary]
     ActionMailer::Base.deliveries = []

data/test/unit/policy_test.rb

@@ -5,18 +5,18 @@ class PolicyTest < ActiveSupport::TestCase
     ForemanOpenscap::Policy.any_instance.stubs(:ensure_needed_puppetclasses).returns(true)
     ForemanOpenscap::DataStreamValidator.any_instance.stubs(:validate)
     ForemanOpenscap::ScapContent.any_instance.stubs(:fetch_profiles).returns({ 'test_profile_key' => 'test_profile_title' })
-    @scap_content = FactoryGirl.create(:scap_content)
-    @scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => @scap_content)
-    @tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
+    @scap_content = FactoryBot.create(:scap_content)
+    @scap_profile = FactoryBot.create(:scap_content_profile, :scap_content => @scap_content)
+    @tailoring_profile = FactoryBot.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
   end
 
   test "should assign hostgroups by their ids" do
-    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryGirl.create(:puppetclass, :name => 'foreman_scap_client'))
+    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
-    hg1 = FactoryGirl.create(:hostgroup)
-    hg2 = FactoryGirl.create(:hostgroup)
-    asset = FactoryGirl.create(:asset, :assetable_id => hg1.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    hg1 = FactoryBot.create(:hostgroup)
+    hg2 = FactoryBot.create(:hostgroup)
+    asset = FactoryBot.create(:asset, :assetable_id => hg1.id, :assetable_type => 'Hostgroup')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.hostgroup_ids = [hg1, hg2].map(&:id)
     policy.save!
     assert_equal 2, policy.hostgroups.count
@@ -24,11 +24,11 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should remove associated hostgroup" do
-    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryGirl.create(:puppetclass, :name => 'foreman_scap_client'))
+    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
     ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
-    hg = FactoryGirl.create(:hostgroup)
-    asset = FactoryGirl.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
-    policy = FactoryGirl.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    hg = FactoryBot.create(:hostgroup)
+    asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.save!
     hg.hostgroup_classes.destroy_all
     hg.destroy
@@ -144,17 +144,17 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should have correct scap profile in enc" do
-    p = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    p = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     profile_id = p.scap_content_profile.profile_id
     assert_equal profile_id, p.to_enc['profile_id']
-    tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
+    tailoring_profile = FactoryBot.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
     p.tailoring_file_profile = tailoring_profile
     assert_equal tailoring_profile.profile_id, p.to_enc['profile_id']
   end
 
   test "should not create policy with incorrect tailoring profile" do
-    tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.common_tailoring_profile')
-    tailoring_file = FactoryGirl.create(:tailoring_file, :scap_content_profiles => [tailoring_profile])
+    tailoring_profile = FactoryBot.create(:scap_content_profile, :profile_id => 'xccdf_org.test.common_tailoring_profile')
+    tailoring_file = FactoryBot.create(:tailoring_file, :scap_content_profiles => [tailoring_profile])
     p = ForemanOpenscap::Policy.create(:name => "custom_policy",
                                        :period => 'monthly',
                                        :day_of_month => '5',
@@ -178,7 +178,7 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should have digest in enc download path for tailoring file" do
-    tailoring_file = FactoryGirl.create(:tailoring_file)
+    tailoring_file = FactoryBot.create(:tailoring_file)
     p = ForemanOpenscap::Policy.new(:name => "custom_policy",
                                     :scap_content_id => @scap_content.id,
                                     :scap_content_profile_id => @scap_profile.id,
@@ -191,27 +191,27 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should have assigned a content profile that belongs to assigned scap content" do
-    scap_content_2 = FactoryGirl.create(:scap_content)
+    scap_content_2 = FactoryBot.create(:scap_content)
     p = ForemanOpenscap::Policy.create(:name => "valid_profile_policy",
-                                        :scap_content_id => @scap_content.id,
-                                        :scap_content_profile_id => @scap_profile.id,
-                                        :period => 'monthly',
-                                        :day_of_month => '5')
+                                       :scap_content_id => @scap_content.id,
+                                       :scap_content_profile_id => @scap_profile.id,
+                                       :period => 'monthly',
+                                       :day_of_month => '5')
     assert p.valid?
     q = ForemanOpenscap::Policy.create(:name => "invalid_profile_policy",
-                                        :scap_content_id => scap_content_2.id,
-                                        :scap_content_profile_id => @scap_profile.id,
-                                        :period => 'monthly',
-                                        :day_of_month => '5')
+                                       :scap_content_id => scap_content_2.id,
+                                       :scap_content_profile_id => @scap_profile.id,
+                                       :period => 'monthly',
+                                       :day_of_month => '5')
     refute q.valid?
     assert_equal "does not have the selected SCAP content profile", q.errors.messages[:scap_content_id].first
   end
 
   test "should delete arf_report when deleting policy" do
-    policy = FactoryGirl.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
-    host = FactoryGirl.create(:compliance_host)
-    arf_report = FactoryGirl.create(:arf_report, :host_id => host.id)
-    policy_arf_report = FactoryGirl.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
+    policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    host = FactoryBot.create(:compliance_host)
+    arf_report = FactoryBot.create(:arf_report, :host_id => host.id)
+    policy_arf_report = FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => arf_report.id)
     policy.destroy
     assert_empty ForemanOpenscap::PolicyArfReport.where(:id => policy_arf_report.id)
     assert_empty ForemanOpenscap::ArfReport.where(:id => arf_report.id)