diff options
author | Matthew Draper <matthew@trebex.net> | 2017-05-26 12:24:43 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 12:24:43 +0930 |
commit | 4cfcf1ee542706c92c6c9b2e973e81b673fb220f (patch) | |
tree | 3bd9ec449ab553c73f34ec018f5450938b6831c7 /activesupport/test/testing/file_fixtures_test.rb | |
parent | 881823176a3fcaa3711900f2cdfd66b11a6df18a (diff) | |
parent | 40bdbce191ad90dfea43dad51fac5c4726b89392 (diff) | |
download | rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.gz rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.bz2 rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.zip |
Merge pull request #29176 from bogdanvlviv/define-path-with__dir__
Define path with __dir__
Diffstat (limited to 'activesupport/test/testing/file_fixtures_test.rb')
-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 faa81b5e75..9f28252c31 100644 --- a/activesupport/test/testing/file_fixtures_test.rb +++ b/activesupport/test/testing/file_fixtures_test.rb @@ -3,7 +3,7 @@ require "abstract_unit" require "pathname" class FileFixturesTest < ActiveSupport::TestCase - self.file_fixture_path = File.expand_path("../../file_fixtures", __FILE__) + self.file_fixture_path = File.expand_path("../file_fixtures", __dir__) test "#file_fixture returns Pathname to file fixture" do path = file_fixture("sample.txt") @@ -20,7 +20,7 @@ class FileFixturesTest < ActiveSupport::TestCase end class FileFixturesPathnameDirectoryTest < ActiveSupport::TestCase - self.file_fixture_path = Pathname.new(File.expand_path("../../file_fixtures", __FILE__)) + self.file_fixture_path = Pathname.new(File.expand_path("../file_fixtures", __dir__)) test "#file_fixture_path returns Pathname to file fixture" do path = file_fixture("sample.txt") |