From 10ca084e2c5f59971957cc50b78374189fb9f238 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 27 Aug 2020 09:54:27 +0200 Subject: [PATCH] Fix tests --- test/functional/dmsf_controller_test.rb | 3 ++- test/functional/dmsf_files_controller_test.rb | 2 +- test/functional/dmsf_files_copy_controller_test.rb | 2 +- test/functional/dmsf_folder_permissions_controller_test.rb | 3 ++- test/functional/dmsf_folders_copy_controller_test.rb | 2 +- test/functional/dmsf_links_controller_test.rb | 2 +- test/functional/dmsf_public_urls_controller_test.rb | 2 +- test/functional/dmsf_state_controller_test.rb | 2 ++ test/functional/dmsf_workflow_controller_test.rb | 3 ++- test/functional/my_controller_test.rb | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb index c622f7af..35d86ade 100644 --- a/test/functional/dmsf_controller_test.rb +++ b/test/functional/dmsf_controller_test.rb @@ -25,7 +25,8 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n include Rails.application.routes.url_helpers - fixtures :custom_fields, :custom_values, :dmsf_links, :dmsf_folder_permissions, :dmsf_locks + fixtures :custom_fields, :custom_values, :dmsf_links, :dmsf_folder_permissions, :dmsf_locks, + :dmsf_folders, :dmsf_files, :dmsf_file_revisions def setup super diff --git a/test/functional/dmsf_files_controller_test.rb b/test/functional/dmsf_files_controller_test.rb index 60465bdf..a4039c74 100644 --- a/test/functional/dmsf_files_controller_test.rb +++ b/test/functional/dmsf_files_controller_test.rb @@ -23,7 +23,7 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfFilesControllerTest < RedmineDmsf::Test::TestCase - fixtures :custom_fields, :custom_values, :dmsf_file_revisions + fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :dmsf_locks def setup super diff --git a/test/functional/dmsf_files_copy_controller_test.rb b/test/functional/dmsf_files_copy_controller_test.rb index f86233fd..479b541d 100644 --- a/test/functional/dmsf_files_copy_controller_test.rb +++ b/test/functional/dmsf_files_copy_controller_test.rb @@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfFilesCopyControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n - fixtures :custom_fields, :custom_values, :dmsf_locks + fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :dmsf_locks def setup super diff --git a/test/functional/dmsf_folder_permissions_controller_test.rb b/test/functional/dmsf_folder_permissions_controller_test.rb index 391b8198..78ac2721 100644 --- a/test/functional/dmsf_folder_permissions_controller_test.rb +++ b/test/functional/dmsf_folder_permissions_controller_test.rb @@ -22,7 +22,8 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfFolderPermissionsControllerTest < RedmineDmsf::Test::TestCase - fixtures :dmsf_folder_permissions + + fixtures :dmsf_folder_permissions, :dmsf_folders, :dmsf_files, :dmsf_file_revisions def setup super diff --git a/test/functional/dmsf_folders_copy_controller_test.rb b/test/functional/dmsf_folders_copy_controller_test.rb index cf6a538c..f903c68b 100644 --- a/test/functional/dmsf_folders_copy_controller_test.rb +++ b/test/functional/dmsf_folders_copy_controller_test.rb @@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfFoldersCopyControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n - fixtures :dmsf_locks + fixtures :dmsf_locks, :dmsf_folders, :dmsf_files, :dmsf_file_revisions def setup super diff --git a/test/functional/dmsf_links_controller_test.rb b/test/functional/dmsf_links_controller_test.rb index 7dac03b2..e3b4f1ef 100644 --- a/test/functional/dmsf_links_controller_test.rb +++ b/test/functional/dmsf_links_controller_test.rb @@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfLinksControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n - fixtures :dmsf_links + fixtures :dmsf_links, :dmsf_folders, :dmsf_files, :dmsf_file_revisions def setup super diff --git a/test/functional/dmsf_public_urls_controller_test.rb b/test/functional/dmsf_public_urls_controller_test.rb index 616b1129..26ea39ce 100644 --- a/test/functional/dmsf_public_urls_controller_test.rb +++ b/test/functional/dmsf_public_urls_controller_test.rb @@ -23,7 +23,7 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfPublicUrlsControllerTest < RedmineDmsf::Test::TestCase - fixtures :dmsf_public_urls + fixtures :dmsf_public_urls, :dmsf_folders, :dmsf_files, :dmsf_file_revisions def test_show_valid_url get :show, params: { token: 'd8d33e21914a433b280fdc94450ee212' } diff --git a/test/functional/dmsf_state_controller_test.rb b/test/functional/dmsf_state_controller_test.rb index 9477aa80..798158c2 100644 --- a/test/functional/dmsf_state_controller_test.rb +++ b/test/functional/dmsf_state_controller_test.rb @@ -24,6 +24,8 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfStateControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n + fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions + def setup super @request.session[:user_id] = @jsmith.id diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb index bef70318..6b34813b 100644 --- a/test/functional/dmsf_workflow_controller_test.rb +++ b/test/functional/dmsf_workflow_controller_test.rb @@ -24,7 +24,8 @@ require File.expand_path('../../test_helper', __FILE__) class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n - fixtures :dmsf_workflows, :dmsf_workflow_steps, :dmsf_workflow_step_assignments + fixtures :dmsf_workflows, :dmsf_workflow_steps, :dmsf_workflow_step_assignments, + :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :dmsf_locks def setup super diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 49d4bcee..621e5f57 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -26,7 +26,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n fixtures :user_preferences, :dmsf_workflows, :dmsf_workflow_steps, :dmsf_workflow_step_assignments, - :dmsf_workflow_step_actions, :dmsf_locks + :dmsf_workflow_step_actions, :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :dmsf_locks def setup super