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 /actionpack/test/controller/live_stream_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 'actionpack/test/controller/live_stream_test.rb')
| -rw-r--r-- | actionpack/test/controller/live_stream_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb index 581081dd07..bfb47b90d5 100644 --- a/actionpack/test/controller/live_stream_test.rb +++ b/actionpack/test/controller/live_stream_test.rb @@ -152,7 +152,7 @@ module ActionController end def write_sleep_autoload - path = File.join(File.dirname(__FILE__), "../fixtures") + path = File.expand_path("../fixtures", __dir__) ActiveSupport::Dependencies.autoload_paths << path response.headers["Content-Type"] = "text/event-stream" |