Skip to content

Commit

Permalink
Fix more broken tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ahukkanen committed Apr 23, 2024
1 parent 5848407 commit c562708
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion actionpack/test/controller/renderer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class RendererTest < ActiveSupport::TestCase
end

test "rendering with helpers" do
assert_equal "<p>1\n<br />2</p>", render(inline: '<%= simple_format "1\n2" %>')
assert_equal "<p>1\n<br>2</p>", render(inline: '<%= simple_format "1\n2" %>')
end

test "rendering with user specified defaults" do
Expand Down
6 changes: 3 additions & 3 deletions railties/test/application/asset_debugging_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ class ::PostsController < ActionController::Base ; end
javascript_path: %r{/javascripts/#{contents}},
stylesheet_path: %r{/stylesheets/#{contents}},
image_tag: %r{<img src="/images/#{contents}"},
favicon_link_tag: %r{<link rel="icon" type="image/x-icon" href="/images/#{contents}" />},
stylesheet_link_tag: %r{<link rel="stylesheet" href="/stylesheets/#{contents}.css" />},
favicon_link_tag: %r{<link rel="icon" type="image/x-icon" href="/images/#{contents}">},
stylesheet_link_tag: %r{<link rel="stylesheet" href="/stylesheets/#{contents}.css">},
javascript_include_tag: %r{<script src="/javascripts/#{contents}.js">},
audio_tag: %r{<audio src="/audios/#{contents}"></audio>},
video_tag: %r{<video src="/videos/#{contents}"></video>},
image_submit_tag: %r{<input type="image" src="/images/#{contents}" />}
image_submit_tag: %r{<input type="image" src="/images/#{contents}">}
}

class ::PostsController < ActionController::Base
Expand Down
4 changes: 2 additions & 2 deletions railties/test/application/configuration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3294,7 +3294,7 @@ def index
app "development"

get "/"
assert_match %r[<link rel="stylesheet" href="/application.css" />], last_response.body
assert_match %r[<link rel="stylesheet" href="/application.css">], last_response.body
assert_equal "</application.css>; rel=preload; as=style; nopush", last_response.headers["Link"]
end

Expand All @@ -3320,7 +3320,7 @@ def index
app "development"

get "/"
assert_match %r[<link rel="stylesheet" href="/application.css" />], last_response.body
assert_match %r[<link rel="stylesheet" href="/application.css">], last_response.body
assert_nil last_response.headers["Link"]
end

Expand Down
2 changes: 1 addition & 1 deletion railties/test/railties/mounted_engine_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def app

# test that the Active Storage direct upload URL is added to a file field that explicitly requires it within en engine's view code
get "/someone/blog/file_field_with_direct_upload_path"
assert_equal "<input type=\"file\" name=\"image\" id=\"image\" data-direct-upload-url=\"http://example.org/rails/active_storage/direct_uploads\" />", last_response.body
assert_equal "<input type=\"file\" name=\"image\" id=\"image\" data-direct-upload-url=\"http://example.org/rails/active_storage/direct_uploads\">", last_response.body
end

test "route path for controller action when engine is mounted at root" do
Expand Down

0 comments on commit c562708

Please sign in to comment.