foreman_openscap 0.8.3 → 0.8.4

data/test/unit/scap_content_test.rb

@@ -25,7 +25,7 @@ class ScapContentTest < ActiveSupport::TestCase
 
     test 'proxy_url should return the first available proxy it finds' do
       available_proxy = SmartProxy.with_features('Openscap').first
-      unavailable_proxy = FactoryGirl.create(:smart_proxy, :url => 'http://proxy.example.com:8443', :features => [FactoryGirl.create(:feature, :name => 'Openscap')])
+      unavailable_proxy = FactoryBot.create(:smart_proxy, :url => 'http://proxy.example.com:8443', :features => [FactoryBot.create(:feature, :name => 'Openscap')])
       available_proxy.stubs(:proxy_url).returns(available_proxy.url)
       unavailable_proxy.stubs(:proxy_url).returns(nil)
       scap_content = ForemanOpenscap::ScapContent.new(:title => 'Fedora', :scap_file => @scap_file)
@@ -34,15 +34,15 @@ class ScapContentTest < ActiveSupport::TestCase
   end
 
   test 'should update profile title when fetching profiles from proxy' do
-    scap_content = FactoryGirl.create(:scap_content)
+    scap_content = FactoryBot.create(:scap_content)
     scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "Changed title" })
-    scap_profile = FactoryGirl.create(:scap_content_profile, :scap_content => scap_content, :profile_id => 'xccdf.test.profile', :title => "Original title")
+    scap_profile = FactoryBot.create(:scap_content_profile, :scap_content => scap_content, :profile_id => 'xccdf.test.profile', :title => "Original title")
     scap_content.create_profiles
     assert_equal scap_profile.reload.title, 'Changed title'
   end
 
   test 'should create profile when fetching profiles from proxy' do
-    scap_content = FactoryGirl.create(:scap_content)
+    scap_content = FactoryBot.create(:scap_content)
     scap_content.stubs(:fetch_profiles).returns({ "xccdf.test.profile" => "My title" })
     scap_content.create_profiles
     assert scap_content.reload.scap_content_profiles.where(:title => 'My title').first

data/test/unit/services/report_dashboard/data_test.rb

@@ -2,18 +2,18 @@ require 'test_plugin_helper'
 
 class DataTest < ActiveSupport::TestCase
   setup do
-    @host = FactoryGirl.create(:compliance_host)
-    @arf = FactoryGirl.create(:arf_report, :host_id => @host.id)
-    @source = FactoryGirl.create(:source)
+    @host = FactoryBot.create(:compliance_host)
+    @arf = FactoryBot.create(:arf_report, :host_id => @host.id)
+    @source = FactoryBot.create(:source)
     @failed = []
     @passed = []
     3.times do
-      @failed << FactoryGirl.create(:compliance_log, :report_id => @arf.id, :source => @source)
+      @failed << FactoryBot.create(:compliance_log, :report_id => @arf.id, :source => @source)
     end
     2.times do
-      @passed << FactoryGirl.create(:compliance_log, :report_id => @arf.id, :result => "pass", :source => @source)
+      @passed << FactoryBot.create(:compliance_log, :report_id => @arf.id, :result => "pass", :source => @source)
     end
-    @othered = [FactoryGirl.create(:compliance_log, :report_id => @arf.id, :result => "unknown", :source => @source)]
+    @othered = [FactoryBot.create(:compliance_log, :report_id => @arf.id, :result => "unknown", :source => @source)]
   end
 
   test 'should fetch data' do

data/test/unit/services/tailoring_files_proxy_check_test.rb

@@ -19,7 +19,7 @@ class TailoringFilesProxyCheckTest < ActiveSupport::TestCase
 
   test 'should fail when proxy cannot be reached' do
     ProxyStatus::Version.any_instance.stubs(:version).raises(Foreman::WrappedException.new(nil, 'test message'))
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:get_openscap_proxies).returns([FactoryGirl.create(:openscap_proxy)])
+    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:get_openscap_proxies).returns([FactoryBot.create(:openscap_proxy)])
     check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
     refute check.pass?
     refute check.message.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -128,6 +128,7 @@ files:
 - app/views/arf_reports/index.html.erb
 - 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
@@ -218,6 +219,7 @@ files:
 - db/migrate/20170821081205_rename_mail_notification.foreman_openscap.rb
 - db/migrate/20170830221751_add_index_to_logs_result.rb
 - db/migrate/20171011134112_remove_arf_reports_without_policy.rb
+- db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb