foreman_openscap 2.0.2 → 4.0.2

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

@@ -3,9 +3,6 @@ require 'tmpdir'
 
 class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   setup do
-    # required for mysql where database cleaner does not cleanup things properly
-    # because of arf_create does explicit transaction commit
-    Message.delete_all
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
     @host = FactoryBot.create(:compliance_host)

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

@@ -0,0 +1,15 @@
+require 'test_plugin_helper'
+
+class Api::V2::Compliance::ScapContentProfilesControllerTest < ActionController::TestCase
+  test "should get index" do
+    2.times do
+      FactoryBot.create(:scap_content_profile)
+    end
+    FactoryBot.create(:scap_content, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.first])
+    FactoryBot.create(:tailoring_file, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.last])
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert response['results'].any?
+    assert_response :success
+  end
+end

data/test/test_plugin_helper.rb

@@ -55,8 +55,8 @@ module ScapTestCommon
   def create_report_with_rules(host, rule_names, rule_results)
     raise "rule_names and rule_results should have the same length!" if rule_names.size != rule_results.size
     metrics = {
-      'passed' => rule_results.select { |result| result == 'pass' }.count,
-      'failed' => rule_results.select { |result| result == 'fail' }.count,
+      'passed' => rule_results.count { |result| result == 'pass' },
+      'failed' => rule_results.count { |result| result == 'fail' },
       'othered' => rule_results.reject { |result| result == 'fail' || result == 'pass' }.count
     }
     report = FactoryBot.create(:arf_report, :host_id => host.id, :metrics => metrics, :status => metrics)

data/test/unit/policy_test.rb

@@ -37,6 +37,15 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal hostgroup, policy.hostgroups.first
   end
 
+  test "should not raise when assiging same host by id" do
+    host1 = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host1.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.host_ids = [host1, host1].map(&:id)
+    policy.save!
+    assert_equal 1, policy.hosts.count
+  end
+
   test "should remove associated hostgroup" do
     hg = FactoryBot.create(:hostgroup)
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 4.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,6 +46,7 @@ files:
 - app/assets/stylesheets/foreman_openscap/scap_breakdown_chart.css
 - app/controllers/api/v2/compliance/arf_reports_controller.rb
 - app/controllers/api/v2/compliance/policies_controller.rb
+- app/controllers/api/v2/compliance/scap_content_profiles_controller.rb
 - app/controllers/api/v2/compliance/scap_contents_controller.rb
 - app/controllers/api/v2/compliance/tailoring_files_controller.rb
 - app/controllers/arf_reports_controller.rb
@@ -125,6 +126,9 @@ files:
 - app/views/api/v2/compliance/policies/index.json.rabl
 - app/views/api/v2/compliance/policies/main.json.rabl
 - app/views/api/v2/compliance/policies/show.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/base.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/index.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/main.json.rabl
 - app/views/api/v2/compliance/scap_contents/base.json.rabl
 - app/views/api/v2/compliance/scap_contents/create.json.rabl
 - app/views/api/v2/compliance/scap_contents/index.json.rabl
@@ -239,6 +243,8 @@ files:
 - db/migrate/20171011134112_remove_arf_reports_without_policy.rb
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
+- db/migrate/20200117135424_migrate_port_overrides_to_int.rb
+- db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -253,45 +259,32 @@ 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/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
 - 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_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -310,6 +303,7 @@ files:
 - 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_content_profiles_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
@@ -355,19 +349,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
+- test/factories/compliance_host_factory.rb
 - test/factories/compliance_log_factory.rb
 - test/factories/policy_arf_report_factory.rb
 - test/factories/policy_factory.rb
 - test/factories/scap_content_related.rb
-- test/factories/compliance_host_factory.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
 - test/files/arf_report/arf_report.json
@@ -378,19 +371,23 @@ test_files:
 - 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_content_profiles_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/helpers/arf_report_dashboard_helper_test.rb
+- test/helpers/policy_dashboard_helper_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/openscap_proxy_extenstions_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/scap_content_test.rb
 - test/unit/services/config_name_service_test.rb
@@ -399,8 +396,5 @@ test_files:
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
-- test/unit/arf_report_test.rb
-- test/unit/openscap_host_test.rb
 - test/unit/policy_test.rb
-- test/helpers/arf_report_dashboard_helper_test.rb
-- test/helpers/policy_dashboard_helper_test.rb
+- test/test_plugin_helper.rb