aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-07-13 11:48:38 -0700
committerZachary Scott <e@zzak.io>2014-07-13 11:48:38 -0700
commit9ce01dbfd133cb65f565b39764ab11a3b5287bbd (patch)
tree8628518a5baf6dfaa7dd646e235f9b4c14b34754 /actionpack/test
parentccac6082bd4265f4827cc8bf9748c983d0a1c6c6 (diff)
parentdfee0327b5528caacfe277ccf4d0168b7b96cc05 (diff)
downloadrails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.tar.gz
rails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.tar.bz2
rails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.zip
Merge pull request #16155 from mechanicles/fix-typos
[ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/new_base/render_template_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index b7a9cf92f2..e87811776a 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -9,7 +9,7 @@ module RenderTemplate
"locals.html.erb" => "The secret is <%= secret %>",
"xml_template.xml.builder" => "xml.html do\n xml.p 'Hello'\nend",
"with_raw.html.erb" => "Hello <%=raw '<strong>this is raw</strong>' %>",
- "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a html template",
+ "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in an html template",
"with_implicit_raw.text.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a text template",
"test/with_json.html.erb" => "<%= render :template => 'test/with_json', :formats => [:json] %>",
"test/with_json.json.erb" => "<%= render :template => 'test/final', :formats => [:json] %>",
@@ -114,7 +114,7 @@ module RenderTemplate
get :with_implicit_raw
- assert_body "Hello <strong>this is also raw</strong> in a html template"
+ assert_body "Hello <strong>this is also raw</strong> in an html template"
assert_status 200
get :with_implicit_raw, format: 'text'