Merge commit 'mainstream/master'

7 files changed, 16 insertions, 5 deletions

diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
index b8e7001351..2d373ce422 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
@@ -1,5 +1,5 @@
 class MetalA < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
index adc2f45fcf..a8bbf3fd60 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
@@ -1,5 +1,5 @@
 class MetalB < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb
new file mode 100644
index 0000000000..0cd3737c32
--- /dev/null
+++ b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb
@@ -0,0 +1,5 @@
+class LegacyRoutes < Rails::Rack::Metal
+  def self.call(env)
+    [301, { "Location" => "http://example.com"}, []]
+  end
+end
diff --git a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
index 9ade2ce8e7..5f5b087592 100644
--- a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
+++ b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
@@ -1,5 +1,5 @@
 class FooMetal < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
index 71a5a62eb8..25b3bb0abc 100644
--- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
+++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
@@ -1,7 +1,7 @@
 module Folder
   class MetalA < Rails::Rack::Metal
     def self.call(env)
-      [200, { "Content-Type" => "text/html"}, "Hi"]
+      [200, { "Content-Type" => "text/html"}, ["Hi"]]
     end
   end
 end
diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
index 430d7bfed6..7583363f71 100644
--- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
+++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
@@ -1,7 +1,7 @@
 module Folder
   class MetalB < Rails::Rack::Metal
     def self.call(env)
-      [200, { "Content-Type" => "text/html"}, "Hi"]
+      [200, { "Content-Type" => "text/html"}, ["Hi"]]
     end
   end
 end
diff --git a/railties/test/metal_test.rb b/railties/test/metal_test.rb
index 143efdda11..d3d231132b 100644
--- a/railties/test/metal_test.rb
+++ b/railties/test/metal_test.rb
@@ -8,6 +8,12 @@ class MetalTest < Test::Unit::TestCase
     end
   end
 
+  def test_metals_should_respect_class_name_conventions
+    use_appdir("pluralmetal") do
+      assert_equal(["LegacyRoutes"], found_metals_as_string_array)
+    end
+  end
+
   def test_metals_should_return_alphabetical_list_of_found_metal_apps
     use_appdir("multiplemetals") do
       assert_equal(["MetalA", "MetalB"], found_metals_as_string_array)