foreman_openscap 0.8.6 → 0.9.0

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

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCase
   test "should get index" do
     FactoryBot.create(:scap_content)
-    get :index, {}, set_session_user
+    get :index, :session => set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert response['results'].any?
     assert_response :success
@@ -11,13 +11,13 @@ class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCa
 
   test "should return xml of scap content" do
     scap_content = FactoryBot.create(:scap_content)
-    get :show, { :id => scap_content.id }, set_session_user
+    get :show, :params => { :id => scap_content.id }, :session => set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
 
   test "should not create invalid scap content" do
-    post :create, {}, set_session_user
+    post :create, :session => set_session_user
     assert_response :unprocessable_entity
   end
 
@@ -27,7 +27,7 @@ class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCa
 
   test "should update scap content" do
     scap_content = FactoryBot.create(:scap_content)
-    put :update, { :id => scap_content.id, :scap_content => { :title => 'RHEL7 SCAP' } }, set_session_user
+    put :update, :params => { :id => scap_content.id, :scap_content => { :title => 'RHEL7 SCAP' } }, :session => set_session_user
     assert_response :success
     assert scap_content.title, 'RHEL7 SCAP'
   end
@@ -36,13 +36,13 @@ class Api::V2::Compliance::ScapContentsControllerTest < ActionController::TestCa
     skip("Solve 'ActiveRecord::RecordInvalid' error")
     ProxyAPI::Openscap.any_instance.stubs(:validate_scap_content).returns({ 'errors' => ['Invalid file'] })
     scap_content = FactoryBot.create(:scap_content)
-    put :update, { :id => scap_content.id, :scap_content => { :scap_file => '<xml>blah</xml>' } }, set_session_user
+    put :update, :params => { :id => scap_content.id, :scap_content => { :scap_file => '<xml>blah</xml>' } }, :session => set_session_user
     assert_response :unprocessable_entity
   end
 
   test "should destory scap content" do
     scap_content = FactoryBot.create(:scap_content)
-    delete :destroy, { :id => scap_content.id }, set_session_user
+    delete :destroy, :params => { :id => scap_content.id }, :session => set_session_user
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(scap_content.id)
   end

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

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::TestCase
   test "should get index" do
     FactoryBot.create(:tailoring_file)
-    get :index, {}, set_session_user
+    get :index, :session => set_session_user
     response = ActiveSupport::JSON.decode(@response.body)
     assert response['results'].any?
     assert_response :success
@@ -11,13 +11,13 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
 
   test "should return xml of tailoring_file" do
     tailoring_file = FactoryBot.create(:tailoring_file)
-    get :show, { :id => tailoring_file.id }, set_session_user
+    get :show, :params => { :id => tailoring_file.id }, :session => set_session_user
     assert(@response.header['Content-Type'], 'application/xml')
     assert_response :success
   end
 
   test "should not create invalid tailoring_file" do
-    post :create, {}, set_session_user
+    post :create, :session => set_session_user
     assert_response :unprocessable_entity
   end
 
@@ -26,13 +26,13 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
     ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
                                               .returns({})
-    post :create, tf_params, set_session_user
+    post :create, :params => tf_params, :session => set_session_user
     assert_response :success
   end
 
   test "should update tailoring_file" do
     tailoring_file = FactoryBot.create(:tailoring_file)
-    put :update, { :id => tailoring_file.id, :tailoring_file => { :name => 'RHEL7 SCAP' } }, set_session_user
+    put :update, :params => { :id => tailoring_file.id, :tailoring_file => { :name => 'RHEL7 SCAP' } }, :session => set_session_user
     assert_response :success
     assert tailoring_file.name, 'RHEL7 SCAP'
   end
@@ -40,13 +40,13 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   test "should not update invalid tailoring_file" do
     tailoring_file = FactoryBot.create(:tailoring_file)
     ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({ 'errors' => ['Invalid file'] })
-    put :update, { :id => tailoring_file.id, :tailoring_file => { :scap_file => '<xml>blah</xml>' } }, set_session_user
+    put :update, :params => { :id => tailoring_file.id, :tailoring_file => { :scap_file => '<xml>blah</xml>' } }, :session => set_session_user
     assert_response :unprocessable_entity
   end
 
   test "should destory tailoring_file" do
     tailoring_file = FactoryBot.create(:tailoring_file)
-    delete :destroy, { :id => tailoring_file.id }, set_session_user
+    delete :destroy, :params => { :id => tailoring_file.id }, :session => set_session_user
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(tailoring_file.id)
   end
@@ -56,7 +56,7 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
     ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
                                               .returns('test-proxy' => '0.5.4')
-    post :create, tf_params, set_session_user
+    post :create, :params => tf_params, :session => set_session_user
     assert_response :unprocessable_entity
   end
 end

data/test/functional/arf_reports_controller_test.rb

@@ -11,7 +11,7 @@ class ArfReportsControllerTest < ActionController::TestCase
     ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy).returns(@host.openscap_proxy)
     arf_report = FactoryBot.create(:arf_report, :host_id => @host.id)
     assert_difference("ForemanOpenscap::ArfReport.count", -1) do
-      delete :destroy, { :id => arf_report.id }, set_session_user
+      delete :destroy, :params => { :id => arf_report.id }, :session => set_session_user
     end
     assert_redirected_to arf_reports_path
   end
@@ -24,7 +24,7 @@ class ArfReportsControllerTest < ActionController::TestCase
     end
     last_arf = arf_reports[-1]
     assert_difference("ForemanOpenscap::ArfReport.unscoped.count", -2) do
-      post :submit_delete_multiple, { :arf_report_ids => arf_reports[0..-2].map(&:id) }, set_session_user
+      post :submit_delete_multiple, :params => { :arf_report_ids => arf_reports[0..-2].map(&:id) }, :session => set_session_user
     end
     assert_redirected_to arf_reports_path
     assert_equal last_arf, ForemanOpenscap::ArfReport.unscoped.first
@@ -34,7 +34,7 @@ class ArfReportsControllerTest < ActionController::TestCase
     arf_report = FactoryBot.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
+    get :download_html, :params => { :id => arf_report.id }, :session => set_session_user
     assert_equal report_html, @response.body
   end
 end

data/test/functional/openscap_proxies_controller_test.rb

@@ -9,7 +9,7 @@ class OpenscapProxiesControllerTest < ActionController::TestCase
     spool_error = { "timestamp" => 1_487_144_633.951_368, "level" => "ERROR", "message" => "Failed to parse Arf Report in test" }
     OpenscapProxiesController.any_instance.stubs(:find_spool_error).returns(spool_error)
     proxy = FactoryBot.create(:openscap_proxy)
-    get :openscap_spool, { :id => proxy.id }, set_session_user
+    get :openscap_spool, :params => { :id => proxy.id }, :session => set_session_user
     assert_template :partial => 'smart_proxies/_openscap_spool'
     assert @response.body.match(date_time_relative_value(Time.at(spool_error["timestamp"])))
   end

data/test/functional/tailoring_files_controller_test.rb

@@ -7,30 +7,30 @@ class TailoringFilesControllerTest < ActionController::TestCase
   end
 
   test 'index' do
-    get :index, {}, set_session_user
+    get :index, :session => set_session_user
     assert_template 'index'
   end
 
   test 'new' do
-    get :new, {}, set_session_user
+    get :new, :session => set_session_user
     assert_template 'new'
   end
 
   test 'edit' do
-    get :edit, { :id => @tailoring_file.id }, set_session_user
+    get :edit, :params => { :id => @tailoring_file.id }, :session => set_session_user
     assert_template 'edit'
   end
 
   test 'create' do
-    uploaded_file = Rack::Test::UploadedFile.new(@scap_file, 'text/xml')
+    uploaded_file = Rack::Test::UploadedFile.new(@scap_file, 'text/xml', :original_filename => 'uploaded_tailoring.file')
     # uploaded_file.original_filename = 'uploaded-tailoring-file.xml'
-    post :create, { :tailoring_file => { :name => 'some_file', :scap_file => uploaded_file } }, set_session_user
+    post :create, :params => { :tailoring_file => { :name => 'some_file', :scap_file => uploaded_file } }, :session => set_session_user
     assert_redirected_to tailoring_files_url
   end
 
   test 'destroy' do
     tf = ForemanOpenscap::TailoringFile.first
-    delete :destroy, { :id => tf.id }, set_session_user
+    delete :destroy, :params => { :id => tf.id }, :session => set_session_user
     assert_redirected_to tailoring_files_url
     refute ForemanOpenscap::TailoringFile.exists?(tf.id)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface