Updates test environment config to mark assertionless tests as failed (#36320).

Patch by Takashi Kato (user:tohosaku).

git-svn-id: https://svn.redmine.org/redmine/trunk@22962 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/environments/test.rb b/config/environments/test.rb
index ea6080ac7510ee9bccc9868e864d5acbcaa03909..dc6239ca435a2200486921a1045dc5128980dd5f 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -77,4 +77,6 @@ Rails.application.configure do
   # config.action_view.annotate_rendered_view_with_filenames = true
 
   config.secret_key_base = 'a secret token for running the tests'
+
+  config.active_support.assertionless_tests_behavior = :raise
 end

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 8cb086f12059dc5cc8e937ce8f0042157378d6c9..82991888d60a364a076f94a2cb98790b9e432dd7 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -21,7 +21,6 @@ require_relative '../test_helper'
 
 class ApplicationHelperTest < Redmine::HelperTest
   include ERB::Util
-  include Rails.application.routes.url_helpers
   include AvatarsHelper
 
   fixtures :projects, :enabled_modules,

diff --git a/test/helpers/avatars_helper_test.rb b/test/helpers/avatars_helper_test.rb
index 06c4d59931356438dbffef75ea9c82c6019e916f..d9d87dd107a9e1a327b03c2a1809bd4ef53528f1 100644 (file)
--- a/test/helpers/avatars_helper_test.rb
+++ b/test/helpers/avatars_helper_test.rb
@@ -21,7 +21,6 @@ require_relative '../test_helper'
 
 class AvatarsHelperTest < Redmine::HelperTest
   include ERB::Util
-  include Rails.application.routes.url_helpers
   include AvatarsHelper
 
   fixtures :users, :email_addresses

diff --git a/test/helpers/groups_helper_test.rb b/test/helpers/groups_helper_test.rb
index 6162388a8dfa55f29e870df19dc3a488f6ca4e1e..66abc980805cfc5f8ae6e02a9731fd08089bf983 100644 (file)
--- a/test/helpers/groups_helper_test.rb
+++ b/test/helpers/groups_helper_test.rb
@@ -23,7 +23,6 @@ class GroupsHelperTest < Redmine::HelperTest
   include ERB::Util
   include GroupsHelper
   include AvatarsHelper
-  include Rails.application.routes.url_helpers
 
   fixtures :users
 

diff --git a/test/helpers/issues_helper_test.rb b/test/helpers/issues_helper_test.rb
index c91c47c4a1005148d3df11432b1639a3ce1fb84c..fd469b986e4fdb5b51f762dd19c7f7148f8035ad 100644 (file)
--- a/test/helpers/issues_helper_test.rb
+++ b/test/helpers/issues_helper_test.rb
@@ -23,7 +23,6 @@ class IssuesHelperTest < Redmine::HelperTest
   include IssuesHelper
   include CustomFieldsHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,

diff --git a/test/helpers/members_helper_test.rb b/test/helpers/members_helper_test.rb
index bae1b58ba5d02ca1d8e918c50880a92b653a59ae..a3120711c82e58a726dfd8c554c7c8fb01c7c6f5 100644 (file)
--- a/test/helpers/members_helper_test.rb
+++ b/test/helpers/members_helper_test.rb
@@ -23,7 +23,6 @@ class MembersHelperTest < Redmine::HelperTest
   include ERB::Util
   include MembersHelper
   include AvatarsHelper
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :users, :members, :member_roles,
            :trackers, :issue_statuses

diff --git a/test/helpers/projects_helper_test.rb b/test/helpers/projects_helper_test.rb
index b3ca95e950259bda0ee385d6fda761ddb20c343c..dc6438bc343086a3c1d74b48ade7fdf779e6d226 100644 (file)
--- a/test/helpers/projects_helper_test.rb
+++ b/test/helpers/projects_helper_test.rb
@@ -22,7 +22,6 @@ require_relative '../test_helper'
 class ProjectsHelperTest < Redmine::HelperTest
   include ProjectsHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,

diff --git a/test/helpers/reports_helper_test.rb b/test/helpers/reports_helper_test.rb
index 88a7aad56afb9f365c976a331615f072118bc0e1..9b3ac8a26ab86dc3c707b2b21d2ceffd25c4df03 100644 (file)
--- a/test/helpers/reports_helper_test.rb
+++ b/test/helpers/reports_helper_test.rb
@@ -21,7 +21,6 @@ require_relative '../test_helper'
 
 class ReportsHlperTest < Redmine::HelperTest
   include ReportsHelper
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :users
 

diff --git a/test/helpers/routes_helper_test.rb b/test/helpers/routes_helper_test.rb
index 4a2427c13a9573496172eb64af26b1c0aa06645e..6bca90cf88495b24db702bb8d0f1da9f604411d7 100644 (file)
--- a/test/helpers/routes_helper_test.rb
+++ b/test/helpers/routes_helper_test.rb
@@ -22,8 +22,6 @@ require_relative '../test_helper'
 class RoutesHelperTest < Redmine::HelperTest
   fixtures :projects, :issues
 
-  include Rails.application.routes.url_helpers
-
   def test_time_entries_path
     assert_equal '/projects/ecookbook/time_entries', _time_entries_path(Project.find(1), nil)
     assert_equal '/time_entries', _time_entries_path(nil, nil)

diff --git a/test/helpers/version_helper_test.rb b/test/helpers/version_helper_test.rb
index bb083a4e0649536ae12651dfa54bcc30b8622c61..19243518e612b9a5710455e122bcdd8f3c894139 100644 (file)
--- a/test/helpers/version_helper_test.rb
+++ b/test/helpers/version_helper_test.rb
@@ -20,7 +20,6 @@
 require_relative '../test_helper'
 
 class VersionsHelperTest < Redmine::HelperTest
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :versions, :enabled_modules,
            :users, :members, :roles, :member_roles,

diff --git a/test/helpers/watchers_helper_test.rb b/test/helpers/watchers_helper_test.rb
index 6375c565e245716a4015c00c4373f6663fcac539..cc413f8fadd59e22bb4fc3a14ebd74c690f7afc7 100644 (file)
--- a/test/helpers/watchers_helper_test.rb
+++ b/test/helpers/watchers_helper_test.rb
@@ -23,7 +23,6 @@ class WatchersHelperTest < Redmine::HelperTest
   include WatchersHelper
   include AvatarsHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   fixtures :users, :issues
 

diff --git a/test/helpers/wiki_helper_test.rb b/test/helpers/wiki_helper_test.rb
index dfae80b0b23b53e988fee73d4f70d15659527d7d..eda1bfe1a5efcaaa6611b2fbbabaacfa018039f0 100644 (file)
--- a/test/helpers/wiki_helper_test.rb
+++ b/test/helpers/wiki_helper_test.rb
@@ -21,7 +21,6 @@ require_relative '../test_helper'
 
 class WikiHelperTest < Redmine::HelperTest
   include WikiHelper
-  include Rails.application.routes.url_helpers
 
   fixtures :projects, :users,
            :roles, :member_roles, :members,

diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb
index 25aebbcafb163a8b162bf8e4c3e8f53619807a29..d485518a38da787020196580e1c51b3c07cf8c2c 100644 (file)
--- a/test/unit/lib/redmine/helpers/gantt_test.rb
+++ b/test/unit/lib/redmine/helpers/gantt_test.rb
@@ -29,7 +29,6 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest
   include AvatarsHelper
 
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   def setup
     setup_with_controller

diff --git a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
index 6cdc4b11e22f2220a130bc764266a87278b2e5ed..3d95701823876a0a02acfd2be875088cbf59d43f 100644 (file)
--- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
@@ -22,7 +22,6 @@ require_relative '../../../../test_helper'
 class Redmine::MenuManager::MenuHelperTest < Redmine::HelperTest
   include Redmine::MenuManager::MenuHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   fixtures :users, :members, :projects, :enabled_modules, :roles, :member_roles
 

diff --git a/test/unit/lib/redmine/views/labelled_form_builder_test.rb b/test/unit/lib/redmine/views/labelled_form_builder_test.rb
index e7701c4bcb8459db28f2d72b648000c6eb0df7c3..27ab456fffc6b5a521ac2a1b52958a072563d714 100644 (file)
--- a/test/unit/lib/redmine/views/labelled_form_builder_test.rb
+++ b/test/unit/lib/redmine/views/labelled_form_builder_test.rb
@@ -20,7 +20,6 @@
 require_relative '../../../../test_helper'
 
 class Redmine::Views::LabelledFormBuilderTest < Redmine::HelperTest
-  include Rails.application.routes.url_helpers
 
   def test_label_should_output_one_element
     set_language_if_valid 'en'

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb
index c198f64cd60a632d25f2a0ea5d5963c3dc70f5f3..7b5915f7db9767f62092dc097f74915b9be87912 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb
@@ -23,7 +23,6 @@ class Redmine::WikiFormatting::CommonMark::ApplicationHelperTest < Redmine::Help
   if Object.const_defined?(:CommonMarker)
 
     include ERB::Util
-    include Rails.application.routes.url_helpers
 
     fixtures :projects, :enabled_modules,
              :users, :email_addresses,

diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index b385de6fccdb1d0f1da14fd3bd19d433e4195f44..78235403980b23b31322848530f634adb1269e9c 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -23,7 +23,6 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::SanitizeHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
   extend ActionView::Helpers::SanitizeHelper::ClassMethods
 
   fixtures :projects, :roles, :enabled_modules, :users,

diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
index 6620f6a833d5f62b79fc34dea90389e7919541bd..d4f2f5f996bdedeb6e30712518e32419e75c4b60 100644 (file)
--- a/test/unit/search_test.rb
+++ b/test/unit/search_test.rb
@@ -181,6 +181,8 @@ class SearchTest < ActiveSupport::TestCase
       r = Issue.search_results('ÖÖ')
       assert_include issue1, r
       assert_include issue2, r
+    else
+      skip
     end
   end
 
@@ -191,6 +193,8 @@ class SearchTest < ActiveSupport::TestCase
       r = Issue.search_results('ÖÖ')
       assert_include issue1, r
       assert_include issue2, r
+    else
+      skip
     end
   end