Skip to content

Commit

Permalink
Fix flaky test ActionControllerBaseRenderTest#test_direct_render_to_s…
Browse files Browse the repository at this point in the history
…tring
  • Loading branch information
mtsmfm committed Jul 26, 2019
1 parent 72bc080 commit 6c69ff4
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions actionpack/test/controller/render_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
require "controller/fake_models"

class TestControllerWithExtraEtags < ActionController::Base
self.view_paths = [ActionView::FixtureResolver.new(
"test/with_implicit_template.erb" => "Hello explicitly!",
"test/hello_world.erb" => "Hello world!"
)]

def self.controller_name; "test"; end
def self.controller_path; "test"; end

Expand Down Expand Up @@ -37,6 +42,11 @@ def with_implicit_template
end

class ImplicitRenderTestController < ActionController::Base
self.view_paths = [ActionView::FixtureResolver.new(
"implicit_render_test/hello_world.erb" => "Hello world!",
"implicit_render_test/empty_action_with_template.html.erb" => "<h1>Empty action rendered this implicitly.</h1>\n"
)]

def empty_action
end

Expand All @@ -46,6 +56,10 @@ def empty_action_with_template

module Namespaced
class ImplicitRenderTestController < ActionController::Base
self.view_paths = [ActionView::FixtureResolver.new(
"namespaced/implicit_render_test/hello_world.erb" => "Hello world!"
)]

def hello_world
fresh_when(etag: "abc")
end
Expand Down Expand Up @@ -293,13 +307,15 @@ def determine_layout
module TemplateModificationHelper
private
def modify_template(name)
path = File.expand_path("../fixtures/#{name}.erb", __dir__)
original = File.read(path)
File.write(path, "#{original} Modified!")
hash = @controller.view_paths.first.instance_variable_get(:@hash)
key = name + ".erb"
original = hash[key]
hash[key] = "#{original} Modified!"
ActionView::LookupContext::DetailsKey.clear
yield
ensure
File.write(path, original)
hash[key] = original
ActionView::LookupContext::DetailsKey.clear
end
end

Expand Down

0 comments on commit 6c69ff4

Please sign in to comment.