Permalink
Browse files

Merge pull request #13980 from mellowi/skipping_linked_folder_tests_i…

…f_symlink_is_invalid

Skips linked folder tests if symlink is invalid
  • Loading branch information...
2 parents 1ec25d1 + 28a450d commit 3b684dde779af4cb06950bfe788d8fb0852ab936 @tenderlove tenderlove committed Feb 9, 2014
Showing with 6 additions and 2 deletions.
  1. +6 −2 activerecord/test/cases/fixtures_test.rb
@@ -628,7 +628,9 @@ def test_all_there
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 @@ def test_all_there
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

0 comments on commit 3b684dd

Please sign in to comment.