Skip to content

Commit 1d65ca1

Browse files
authored
Merge pull request rails#46060 from jbampton/fix-word-case-of-html
Fix word case. `html` -> `HTML`
2 parents e5288b2 + 2f699c5 commit 1d65ca1

File tree

20 files changed

+38
-38
lines changed

20 files changed

+38
-38
lines changed

actionmailer/lib/action_mailer/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ module ActionMailer
213213
# end
214214
# end
215215
#
216-
# You can also send attachments with html template, in this case you need to add body, attachments,
216+
# You can also send attachments with HTML template, in this case you need to add body, attachments,
217217
# and custom content type like this:
218218
#
219219
# class NotifierMailer < ApplicationMailer

actionpack/test/controller/new_base/render_html_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ class RenderHtmlTest < Rack::TestCase
165165
assert_status 200
166166
end
167167

168-
test "rendering html should escape the string if it is not html safe" do
168+
test "rendering HTML should escape the string if it is not HTML safe" do
169169
get "/render_html/with_layout/with_unsafe_html_tag"
170170

171171
assert_body "&lt;p&gt;hello world&lt;/p&gt;"
172172
assert_status 200
173173
end
174174

175-
test "rendering html should not escape the string if it is html safe" do
175+
test "rendering HTML should not escape the string if it is HTML safe" do
176176
get "/render_html/with_layout/with_safe_html_tag"
177177

178178
assert_body "<p>hello world</p>"

actionpack/test/controller/new_base/render_template_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class WithoutLayoutController < ActionController::Base
1010
"locals.html.erb" => "The secret is <%= secret %>",
1111
"xml_template.xml.builder" => "xml.html do\n xml.p 'Hello'\nend",
1212
"with_raw.html.erb" => "Hello <%=raw '<strong>this is raw</strong>' %>",
13-
"with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in an html template",
13+
"with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in an HTML template",
1414
"with_implicit_raw.text.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a text template",
1515
"test/with_json.html.erb" => "<%= render template: 'test/with_json', formats: [:json] %>",
1616
"test/with_json.json.erb" => "<%= render template: 'test/final', formats: [:json] %>",
@@ -123,7 +123,7 @@ class TestWithoutLayout < Rack::TestCase
123123

124124
get :with_implicit_raw
125125

126-
assert_body "Hello <strong>this is also raw</strong> in an html template"
126+
assert_body "Hello <strong>this is also raw</strong> in an HTML template"
127127
assert_status 200
128128

129129
get :with_implicit_raw, params: { format: "text" }

actionpack/test/dispatch/debug_exceptions_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def call(env)
170170
routing_table = body[/route_table.*<.table>/m]
171171
assert_match "/:controller(/:action)(.:format)", routing_table
172172
assert_match ":controller#:action", routing_table
173-
assert_no_match "&lt;|&gt;", routing_table, "there should not be escaped html in the output"
173+
assert_no_match "&lt;|&gt;", routing_table, "there should not be escaped HTML in the output"
174174
end
175175

176176
test "displays request and response info when a RoutingError occurs" do
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<test>passed formatted html erb</test>
1+
<test>passed formatted HTML erb</test>

actionview/app/javascript/rails-ujs/features/disable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const disableElement = (e) => {
4545
}
4646
}
4747

48-
// Replace element's html with the 'data-disable-with' after storing original html
48+
// Replace element's HTML with the 'data-disable-with' after storing original html
4949
// and prevent clicking on it
5050
var disableLinkElement = function(element) {
5151
if (getData(element, "ujs:disabled")) { return }

actionview/app/javascript/rails-ujs/utils/form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const serializeElement = (element, additionalParam) => {
3131

3232
// Helper function that returns form elements that match the specified CSS selector
3333
// If form is actually a "form" element this will return associated elements outside the from that have
34-
// the html form attribute set
34+
// the HTML form attribute set
3535
const formElements = (form, selector) => {
3636
if (matches(form, "form")) {
3737
return toArray(form.elements).filter(el => matches(el, selector))

actionview/test/actionpack/controller/render_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,24 +1074,24 @@ def test_should_implicitly_render_js_template_without_layout
10741074

10751075
def test_should_render_formatted_template
10761076
get :formatted_html_erb
1077-
assert_equal "formatted html erb", @response.body
1077+
assert_equal "formatted HTML erb", @response.body
10781078
end
10791079

10801080
def test_should_render_formatted_html_erb_template
10811081
get :formatted_xml_erb
1082-
assert_equal "<test>passed formatted html erb</test>", @response.body
1082+
assert_equal "<test>passed formatted HTML erb</test>", @response.body
10831083
end
10841084

10851085
def test_should_render_formatted_html_erb_template_with_bad_accepts_header
10861086
@request.env["HTTP_ACCEPT"] = "; a=dsf"
10871087
get :formatted_xml_erb
1088-
assert_equal "<test>passed formatted html erb</test>", @response.body
1088+
assert_equal "<test>passed formatted HTML erb</test>", @response.body
10891089
end
10901090

10911091
def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
10921092
@request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */*"
10931093
get :formatted_xml_erb
1094-
assert_equal "<test>passed formatted html erb</test>", @response.body
1094+
assert_equal "<test>passed formatted HTML erb</test>", @response.body
10951095
end
10961096

10971097
def test_layout_test_with_different_layout
@@ -1277,7 +1277,7 @@ def test_render_to_string_with_template_and_html_partial
12771277
get :render_to_string_with_template_and_html_partial
12781278
assert_equal "**only partial**\n", @controller.instance_variable_get(:@text)
12791279
assert_equal "<strong>only partial</strong>\n", @controller.instance_variable_get(:@html)
1280-
assert_equal "<strong>only html partial</strong>\n", @response.body
1280+
assert_equal "<strong>only HTML partial</strong>\n", @response.body
12811281
assert_equal "text/html", @response.media_type
12821282
end
12831283

@@ -1290,7 +1290,7 @@ def test_render_to_string_and_render_with_different_formats
12901290

12911291
def test_render_template_within_a_template_with_other_format
12921292
get :render_template_within_a_template_with_other_format
1293-
expected = "only html partial<p>This is grand!</p>"
1293+
expected = "only HTML partial<p>This is grand!</p>"
12941294
assert_equal expected, @response.body.strip
12951295
assert_equal "text/html", @response.media_type
12961296
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
only html partial
1+
only HTML partial
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
formatted html erb
1+
formatted HTML erb

0 commit comments

Comments
 (0)