foreman_openscap 0.6.4 → 0.6.5

data/test/functional/arf_reports_controller_test.rb

@@ -1,21 +1,40 @@
 require 'test_plugin_helper'
 
 class ArfReportsControllerTest < ActionController::TestCase
-
-  test "should delete selected reports" do
-    host = FactoryGirl.create(:compliance_host)
+  setup do
     ForemanOpenscap::Helper.stubs(:find_name_or_uuid_by_host)
     ::ProxyAPI::Openscap.any_instance.stubs(:destroy_report).returns(true)
-    ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy).returns(host.openscap_proxy)
+    @host = FactoryGirl.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)
+    assert_difference("ForemanOpenscap::ArfReport.count", -1) do
+      delete :destroy, { :id => arf_report.id }, set_session_user
+    end
+    assert_redirected_to arf_reports_path
+  end
+
+  test "should delete multiple reports" do
+    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 << FactoryGirl.create(:arf_report, :host_id => @host.id)
     end
     last_arf = arf_reports[-1]
-    assert_difference("ForemanOpenscap::ArfReport.count", -2) do
+    assert_difference("ForemanOpenscap::ArfReport.unscoped.count", -2) do
       post :submit_delete_multiple, { :arf_report_ids => arf_reports[0..-2].map(&:id) }, set_session_user
     end
     assert_redirected_to arf_reports_path
-    assert_equal last_arf, ForemanOpenscap::ArfReport.first
+    assert_equal last_arf, ForemanOpenscap::ArfReport.unscoped.first
+  end
+
+  test "should download arf report as html" do
+    arf_report = FactoryGirl.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
+    assert_equal report_html, @response.body
   end
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -0,0 +1,25 @@
+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])
+  end
+
+  test "should have download_path in enc without digest" do
+    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions).
+      returns('test-proxy' => '0.5.4')
+    enc_out = JSON.parse @host.policies_enc
+    assert_equal 5, enc_out.first['download_path'].split('/').length
+  end
+
+  test "should have download_path in enc with digest" do
+    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions).
+      returns({})
+    enc_out = JSON.parse @host.policies_enc
+    assert_equal 6, enc_out.first['download_path'].split('/').length
+  end
+end

data/test/unit/policy_test.rb

@@ -7,6 +7,7 @@ class PolicyTest < ActiveSupport::TestCase
     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)
+    @tailoring_profile = FactoryGirl.create(:scap_content_profile, :profile_id => 'xccdf_org.test.tailoring_test_profile')
   end
 
   test "should assign hostgroups by their ids" do
@@ -166,4 +167,27 @@ class PolicyTest < ActiveSupport::TestCase
     p.tailoring_file_profile = tailoring_profile
     assert p.save
   end
+
+  test "should have digest in enc download path for scap content" do
+    p = ForemanOpenscap::Policy.new(:name => "custom_policy",
+                                    :scap_content_id => @scap_content.id,
+                                    :scap_content_profile_id => @scap_profile.id,
+                                    :period => 'monthly',
+                                    :day_of_month => '5')
+    assert_equal 6, p.to_enc['download_path'].split('/').length
+    assert_equal @scap_content.digest, p.to_enc['download_path'].split('/').last
+  end
+
+  test "should have digest in enc download path for tailoring file" do
+    tailoring_file = FactoryGirl.create(:tailoring_file)
+    p = ForemanOpenscap::Policy.new(:name => "custom_policy",
+                                    :scap_content_id => @scap_content.id,
+                                    :scap_content_profile_id => @scap_profile.id,
+                                    :tailoring_file => tailoring_file,
+                                    :tailoring_file_profile => @tailoring_profile,
+                                    :period => 'monthly',
+                                    :day_of_month => '5')
+    assert_equal 6, p.to_enc['tailoring_download_path'].split('/').length
+    assert_equal tailoring_file.digest, p.to_enc['tailoring_download_path'].split('/').last
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - "Šimon Lukašík"
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -56,6 +56,7 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/policy_api.rb
 - app/controllers/concerns/foreman/controller/parameters/scap_content.rb
 - app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb
+- app/controllers/concerns/foreman_openscap/arf_reports_controller_common_extensions.rb
 - app/controllers/concerns/foreman_openscap/hostgroups_controller_extensions.rb
 - app/controllers/concerns/foreman_openscap/hosts_controller_extensions.rb
 - app/controllers/openscap_proxies_controller.rb
@@ -99,6 +100,7 @@ files:
 - app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
 - app/services/foreman_openscap/host_report_dashboard/data.rb
+- app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb
 - app/services/foreman_openscap/openscap_proxy_version_check.rb
 - app/services/foreman_openscap/policy_dashboard/data.rb
 - app/services/foreman_openscap/report_dashboard/data.rb
@@ -140,6 +142,7 @@ files:
 - app/views/foreman_openscap/policy_mailer/_list.erb
 - app/views/foreman_openscap/policy_mailer/_policy.erb
 - app/views/foreman_openscap/policy_mailer/policy_summary.erb
+- app/views/job_templates/run_openscap_scans.erb
 - app/views/policies/_form.html.erb
 - app/views/policies/_list.html.erb
 - app/views/policies/_scap_content_results.html.erb
@@ -217,6 +220,7 @@ files:
 - db/migrate/20160925213031_change_scap_widget_names.rb
 - db/migrate/20161109155255_create_tailoring_files.rb
 - db/migrate/20161223153249_add_permissions_to_arf_report.rb
+- db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
 - lib/foreman_openscap.rb
@@ -263,6 +267,7 @@ files:
 - 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/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
@@ -278,6 +283,7 @@ files:
 - 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/openscap_host_test.rb
 - test/unit/policy_mailer_test.rb
@@ -314,6 +320,7 @@ test_files:
 - test/lib/foreman_openscap/bulk_upload_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
@@ -342,3 +349,4 @@ test_files:
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
 - test/files/arf_report/arf_report.bz2
+- test/files/arf_report/arf_report.html