diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-04-03 22:40:24 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-04-03 22:40:24 +1030 |
| commit | ca14f11b07cf7ae672cf60f10810c4511d096683 (patch) | |
| tree | e0e74d2dc58c02339987c8de7e464f4aeb3842e2 /activesupport/test | |
| parent | 90acb66c3df047fc80ef627a469c57aa73068307 (diff) | |
| parent | 097ac2045a308d76593a27651f17cc43e5dc102b (diff) | |
| download | rails-ca14f11b07cf7ae672cf60f10810c4511d096683.tar.gz rails-ca14f11b07cf7ae672cf60f10810c4511d096683.tar.bz2 rails-ca14f11b07cf7ae672cf60f10810c4511d096683.zip | |
Merge pull request #19625 from strzibny/fix-test-rails-git-layout
Do not depend on Rails git repository layout in ActiveSupport tests
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/dependencies_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 702e26859a..4a1d90bfd6 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -160,7 +160,7 @@ class DependenciesTest < ActiveSupport::TestCase def test_ensures_the_expected_constant_is_defined with_autoloading_fixtures do e = assert_raise(LoadError) { Typo } - assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message + assert_match %r{Unable to autoload constant Typo, expected .*/test/autoloading_fixtures/typo.rb to define it}, e.message end end @@ -178,7 +178,7 @@ class DependenciesTest < ActiveSupport::TestCase assert_equal 1, TypO e = assert_raise(LoadError) { Typo } - assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message + assert_match %r{Unable to autoload constant Typo, expected .*/test/autoloading_fixtures/typo.rb to define it}, e.message end end |