diff options
Diffstat (limited to 'actionview/test/actionpack/controller/render_test.rb')
| -rw-r--r-- | actionview/test/actionpack/controller/render_test.rb | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index 51ec8899b1..6528169312 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -56,7 +56,7 @@ class TestController < ApplicationController    end    def hello_world_file -    render file: File.expand_path("../../../fixtures/actionpack/hello", __FILE__), formats: [:html] +    render file: File.expand_path("../../fixtures/actionpack/hello", __dir__), formats: [:html]    end    # :ported: @@ -125,7 +125,7 @@ class TestController < ApplicationController    # :ported:    def render_file_with_instance_variables      @secret = "in the sauce" -    path = File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_ivar") +    path = File.expand_path("../../fixtures/test/render_file_with_ivar", __dir__)      render file: path    end @@ -142,21 +142,21 @@ class TestController < ApplicationController    def render_file_using_pathname      @secret = "in the sauce" -    render file: Pathname.new(File.dirname(__FILE__)).join("..", "..", "fixtures", "test", "dot.directory", "render_file_with_ivar") +    render file: Pathname.new(__dir__).join("..", "..", "fixtures", "test", "dot.directory", "render_file_with_ivar")    end    def render_file_from_template      @secret = "in the sauce" -    @path = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_ivar")) +    @path = File.expand_path("../../fixtures/test/render_file_with_ivar", __dir__)    end    def render_file_with_locals -    path = File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals") +    path = File.expand_path("../../fixtures/test/render_file_with_locals", __dir__)      render file: path, locals: { secret: "in the sauce" }    end    def render_file_as_string_with_locals -    path = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals")) +    path = File.expand_path("../../fixtures/test/render_file_with_locals", __dir__)      render file: path, locals: { secret: "in the sauce" }    end  | 
