Skip to content

Commit

Permalink
Merge pull request #9 from amatsuda/action_mailer
Browse files Browse the repository at this point in the history
Prevent active_support/test_case.rb from being required

Patch by Akira Matsuda. Thanks!!!
  • Loading branch information
kou committed Aug 28, 2015
2 parents 157ef35 + 35ace21 commit 88f1fc8
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions lib/test/unit/active_support.rb
Expand Up @@ -17,6 +17,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

require "test-unit"
# Prevent AS/test_case.rb from being required after this
unless $LOADED_FEATURES.any? {|lf| lf.end_with? "active_support/test_case.rb"}
$LOAD_PATH.reverse_each do |lp|
path = File.join(lp, "active_support/test_case.rb")
$LOADED_FEATURES << path if File.exist?(path)
end
end
require "active_support/testing/assertions"

module ActiveSupport
Expand Down

0 comments on commit 88f1fc8

Please sign in to comment.