diff options
| author | Mikko Johansson <mikko.johansson@gmail.com> | 2014-02-09 02:52:32 +0200 |
|---|---|---|
| committer | Mikko Johansson <mikko.johansson@gmail.com> | 2014-02-09 02:52:32 +0200 |
| commit | 28a450d590a03f4b77993b50b24c0abdace460ee (patch) | |
| tree | 7e8f5b704b11d92821a9ab19e0d06d11459a646c /activerecord/test | |
| parent | ccd1c435ee646bdbdc54cba16ae3c7e6d504d2fb (diff) | |
| download | rails-28a450d590a03f4b77993b50b24c0abdace460ee.tar.gz rails-28a450d590a03f4b77993b50b24c0abdace460ee.tar.bz2 rails-28a450d590a03f4b77993b50b24c0abdace460ee.zip | |
Skips linked folder tests if symlink is invalid
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index f3a4887a85..37c6af74da 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -628,7 +628,9 @@ class LoadAllFixturesTest < ActiveRecord::TestCase self.class.fixture_path = FIXTURES_ROOT + "/all" self.class.fixtures :all - assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + if File.symlink? FIXTURES_ROOT + "/all/admin" + assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + end ensure ActiveRecord::FixtureSet.reset_cache end @@ -639,7 +641,9 @@ class LoadAllFixturesWithPathnameTest < ActiveRecord::TestCase self.class.fixture_path = Pathname.new(FIXTURES_ROOT).join('all') self.class.fixtures :all - assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + if File.symlink? FIXTURES_ROOT + "/all/admin" + assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + end ensure ActiveRecord::FixtureSet.reset_cache end |