diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-01 21:18:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 21:18:12 -0300 |
| commit | 14996a1490baefb34d64c68403c1b5bcf3773736 (patch) | |
| tree | a2fc5a23c7875c2d5e6136a688a5cd377a8e6b73 /activesupport | |
| parent | 71acc3bd0100ba2ba32b8fe529dc3ea29b629126 (diff) | |
| parent | 6119a9524ba07031771ed80b79798cc27263979c (diff) | |
| download | rails-14996a1490baefb34d64c68403c1b5bcf3773736.tar.gz rails-14996a1490baefb34d64c68403c1b5bcf3773736.tar.bz2 rails-14996a1490baefb34d64c68403c1b5bcf3773736.zip | |
Merge pull request #25625 from voxik/fix-rails-test-git-layout
Do not depend on Rails git repository layout in ActiveSupport tests.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/test/testing/file_fixtures_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/testing/file_fixtures_test.rb b/activesupport/test/testing/file_fixtures_test.rb index 91b8a9071c..3587c1a4d1 100644 --- a/activesupport/test/testing/file_fixtures_test.rb +++ b/activesupport/test/testing/file_fixtures_test.rb @@ -6,7 +6,7 @@ class FileFixturesTest < ActiveSupport::TestCase test "#file_fixture returns Pathname to file fixture" do path = file_fixture("sample.txt") assert_kind_of Pathname, path - assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s + assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s end test "raises an exception when the fixture file does not exist" do @@ -23,6 +23,6 @@ class FileFixturesPathnameDirectoryTest < ActiveSupport::TestCase test "#file_fixture_path returns Pathname to file fixture" do path = file_fixture("sample.txt") assert_kind_of Pathname, path - assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s + assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s end end |