Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md

5 files changed, 18 insertions, 18 deletions

diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
index fad848349a..f4a3db8b41 100644
--- a/actionpack/test/controller/new_base/render_body_test.rb
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -111,17 +111,17 @@ module RenderBody
       assert_status 404
     end
 
-    test "rendering body with nil returns an empty body padded for Safari" do
+    test "rendering body with nil returns an empty body" do
       get "/render_body/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering body with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering body with nil and custom status code returns an empty body and the status" do
       get "/render_body/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
index bfe0271df7..fe11501eeb 100644
--- a/actionpack/test/controller/new_base/render_html_test.rb
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -114,17 +114,17 @@ module RenderHtml
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_html/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_html/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
diff --git a/actionpack/test/controller/new_base/render_plain_test.rb b/actionpack/test/controller/new_base/render_plain_test.rb
index dba2e9f13e..0e36d36b50 100644
--- a/actionpack/test/controller/new_base/render_plain_test.rb
+++ b/actionpack/test/controller/new_base/render_plain_test.rb
@@ -106,17 +106,17 @@ module RenderPlain
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_plain/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_plain/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
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'
diff --git a/actionpack/test/controller/new_base/render_text_test.rb b/actionpack/test/controller/new_base/render_text_test.rb
index abb81d7e71..10bad57cd6 100644
--- a/actionpack/test/controller/new_base/render_text_test.rb
+++ b/actionpack/test/controller/new_base/render_text_test.rb
@@ -106,17 +106,17 @@ module RenderText
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_text/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_text/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end