foreman_openscap 1.0.10 → 2.0.0

data/test/unit/concerns/host_extensions_test.rb

@@ -164,6 +164,13 @@ class HostExtensionsTest < ActiveSupport::TestCase
     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
 
+  test 'should delete asset together with host' do
+    host = FactoryBot.create(:compliance_host)
+    FactoryBot.create(:asset_policy, :asset => host.asset, :policy => @policy)
+    assert host.destroy
+    assert_empty ForemanOpenscap::Asset.where(:assetable_id => host.id, :assetable_type => 'Host::Base')
+  end
+
   private
 
   def setup_hosts_with_policy

data/test/unit/policy_test.rb

@@ -279,4 +279,23 @@ class PolicyTest < ActiveSupport::TestCase
     refute policy.hostgroups.empty?
     refute policy.hosts.empty?
   end
+
+  test "should change deploy type" do
+    policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    setup_puppet_class
+    policy.change_deploy_type({ :deploy_by => 'puppet' })
+    refute policy.errors.any?
+    policy.reload
+    assert 'puppet', policy.deploy_by
+  end
+
+  test 'should not change any attributes when cannot change deploy_by' do
+    name = 'my-policy'
+    policy = FactoryBot.create(:policy, :name => name, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.change_deploy_type({ :name => 'salty policy', :deploy_by => 'salt' })
+    assert policy.errors.any?
+    policy.reload
+    assert_equal policy.deploy_by, 'manual'
+    assert_equal policy.name, name
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 2.0.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Foreman plug-in for managing security compliance reports
 email:
 - slukasik@redhat.com
@@ -96,7 +96,6 @@ files:
 - app/models/foreman_openscap/scap_content.rb
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
-- app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
 - app/services/foreman_openscap/client_config/ansible.rb
 - app/services/foreman_openscap/client_config/base.rb
@@ -146,7 +145,6 @@ files:
 - app/views/arf_reports/show.html.erb
 - app/views/arf_reports/show_html.html.erb
 - app/views/arf_reports/welcome.html.erb
-- app/views/compliance_hosts/_compliance_status.erb
 - app/views/compliance_hosts/show.html.erb
 - app/views/dashboard/_compliance_host_reports_widget.html.erb
 - app/views/dashboard/_compliance_reports_breakdown_widget.html.erb
@@ -254,45 +252,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

data/app/overrides/hosts/overview/host_compliance_status.rb

@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "hosts/show",
-                     :name => "add_compliance_link_to_host",
-                     :insert_bottom => 'td:last',
-                     :partial => 'compliance_hosts/compliance_status')

data/app/views/compliance_hosts/_compliance_status.erb

@@ -1,6 +0,0 @@
-<%= link_to(
-        _('Compliance'),
-        compliance_host_path(@host.id),
-        :title => _("Host compliance details"),
-        :class => 'btn btn-default') if @host.arf_reports.any?
-%>