foreman_openscap 1.0.4 → 1.0.5

data/locale/zh_TW/foreman_openscap.po

@@ -888,6 +888,9 @@ 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 "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgstr ""
+
 msgid "documentation"
 msgstr ""
 

data/test/unit/arf_report_test.rb

@@ -178,6 +178,27 @@ module ForemanOpenscap
       assert_equal res, report_1
     end
 
+    test 'should return same latest reports by scope and by association' do
+      reports = []
+      host = FactoryBot.create(:compliance_host)
+      policy = FactoryBot.create(:policy)
+      3.times do
+        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 << 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 << 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 << 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_equal ForemanOpenscap::ArfReport.of_policy(policy).latest, policy.arf_reports.latest
+    end
+
     private
 
     def create_logs_for_report(report, log_params)

data/test/unit/concerns/host_extensions_test.rb

@@ -156,6 +156,14 @@ class HostExtensionsTest < ActiveSupport::TestCase
     assert_empty not_removed
   end
 
+  test "should not assign mismatched openscap proxy" do
+    host = FactoryBot.create(:compliance_host, :organization => taxonomies(:organization1), :location => taxonomies(:location1))
+    proxy = FactoryBot.create(:openscap_proxy, :organizations => [taxonomies(:organization2)])
+    host.openscap_proxy = proxy
+    refute host.valid?
+    assert_equal host.errors.full_messages.first, "Openscap proxy with id #{proxy.id} doesn't exist or is not assigned to proper organization and/or location"
+  end
+
   private
 
   def setup_hosts_with_policy

data/test/unit/openscap_host_test.rb

@@ -10,8 +10,8 @@ class OpenscapHostTest < ActiveSupport::TestCase
   test 'Host has policy' do
     host = FactoryBot.create(:host)
     assert_empty(host.policies)
-
-    assert(@policy.assign_hosts([host]), 'Host policies should be assigned')
+    @policy.host_ids = [host.id]
+    @policy.save
     assert_includes(host.policies, @policy)
   end
 
@@ -44,10 +44,22 @@ class OpenscapHostTest < ActiveSupport::TestCase
     end
 
     test "reports for policy should return expected reports" do
+      @report_2.created_at += 10.minutes
+      @report_2.save!
       reports = @host.reports_for_policy(@policy)
       assert_equal 2, reports.count
       assert reports.include?(@report_1)
       assert reports.include?(@report_2)
+      # Ensure the last report list first
+      assert_equal @report_2, reports.first
+    end
+
+    test "last report for policy should return the latest report only" do
+      @report_2.created_at += 10.minutes
+      @report_2.save!
+      reports = @host.last_report_for_policy(@policy)
+      assert_equal 1, reports.count
+      assert_equal @report_2, reports.first
     end
 
     test 'scap_status_changed should detect status change' do

data/test/unit/policy_test.rb

@@ -244,4 +244,12 @@ class PolicyTest < ActiveSupport::TestCase
     assert_empty ForemanOpenscap::PolicyArfReport.where(:id => policy_arf_report.id)
     assert_empty ForemanOpenscap::ArfReport.where(:id => arf_report.id)
   end
+
+  test "should not assign policies with diffrent deploy_by options to asset" do
+    host = FactoryBot.create(:compliance_host, :policies => [FactoryBot.create(:policy)])
+    puppet_policy = FactoryBot.create(:policy, :deploy_by => 'puppet')
+    puppet_policy.host_ids = [host.id]
+    refute puppet_policy.save
+    assert_equal "cannot assign to #{host.name}, all assigned policies must be deployed in the same way", puppet_policy.errors[:base].first
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -253,33 +253,59 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_openscap.mo
+- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
+- locale/de/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
+- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
+- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
+- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
+- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
+- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
+- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
+- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
+- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
+- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
+- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
+- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
+- locale/ja/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
+- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
+- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
+- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
+- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
+- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
+- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
+- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
+- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
+- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
+- locale/zh_TW/foreman_openscap.po.time_stamp
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
 - test/factories/compliance_host_factory.rb
@@ -340,50 +366,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/factories/arf_report_factory.rb
+- test/lib/foreman_openscap/bulk_upload_test.rb
+- test/unit/message_cleaner_test.rb
+- test/unit/scap_content_test.rb
+- test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/concerns/host_extensions_test.rb
+- test/unit/openscap_host_test.rb
+- test/unit/tailoring_file_test.rb
+- test/unit/policy_test.rb
+- test/unit/compliance_status_test.rb
+- test/unit/arf_report_status_calculator_test.rb
+- test/unit/policy_mailer_test.rb
+- test/unit/services/tailoring_files_proxy_check_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
+- test/unit/services/report_dashboard/data_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/config_name_service_test.rb
+- test/unit/arf_report_test.rb
+- test/test_plugin_helper.rb
+- test/functional/arf_reports_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
+- test/functional/api/v2/compliance/scap_contents_controller_test.rb
+- test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/functional/openscap_proxies_controller_test.rb
+- test/functional/tailoring_files_controller_test.rb
 - test/factories/asset_factory.rb
-- test/factories/compliance_host_factory.rb
 - test/factories/compliance_log_factory.rb
+- test/factories/arf_report_factory.rb
+- test/factories/scap_content_related.rb
+- test/factories/compliance_host_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
-- test/factories/scap_content_related.rb
-- test/files/arf_report/arf_report.bz2
-- test/files/arf_report/arf_report.html
-- test/files/arf_report/arf_report.json
-- test/files/arf_report/arf_report_msg_desc_changed.json
-- test/files/arf_report/arf_report_msg_value_changed.json
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
-- test/functional/api/v2/compliance/policies_controller_test.rb
-- test/functional/api/v2/compliance/scap_contents_controller_test.rb
-- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
-- test/functional/api/v2/hosts_controller_test.rb
-- test/functional/arf_reports_controller_test.rb
-- test/functional/openscap_proxies_controller_test.rb
-- test/functional/tailoring_files_controller_test.rb
-- test/lib/foreman_openscap/bulk_upload_test.rb
-- test/test_plugin_helper.rb
-- test/unit/arf_report_status_calculator_test.rb
-- test/unit/arf_report_test.rb
-- test/unit/compliance_status_test.rb
-- test/unit/concerns/host_extensions_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_test.rb
-- test/unit/message_cleaner_test.rb
-- test/unit/openscap_host_test.rb
-- test/unit/policy_mailer_test.rb
-- test/unit/policy_test.rb
-- test/unit/scap_content_test.rb
-- test/unit/services/config_name_service_test.rb
-- test/unit/services/hostgroup_overrider_test.rb
-- test/unit/services/lookup_key_overrider_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
-- test/unit/tailoring_file_test.rb
+- test/files/arf_report/arf_report_msg_value_changed.json
+- test/files/arf_report/arf_report.bz2
+- test/files/arf_report/arf_report_msg_desc_changed.json
+- test/files/arf_report/arf_report.json
+- test/files/arf_report/arf_report.html