From 1fef1bedbcb8bc8fe1930a6dc2ad5c9a3c1efe1e Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Sun, 4 Nov 2012 19:22:05 -0200
Subject: Remove some line breaks between array items that make the assert file
 tests harder to read

---
 .../resource_route/resource_route_generator.rb     |  2 +-
 .../test/generators/namespaced_generators_test.rb  | 30 +++++++---------------
 .../scaffold_controller_generator_test.rb          |  9 +++----
 .../test/generators/scaffold_generator_test.rb     | 20 +++++----------
 4 files changed, 19 insertions(+), 42 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
index 121205b254..a0e5553e44 100644
--- a/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
+++ b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
@@ -32,7 +32,7 @@ module Rails
         # route prepends two spaces onto the front of the string that is passed, this corrects that
         route route_string[2..-1]
       end
-      
+
       private
         def route_string
           @route_string ||= ""
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 4b168ae110..9e7626647e 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -244,13 +244,9 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
                 /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
 
     # Views
-    %w(
-      index
-      edit
-      new
-      show
-      _form
-    ).each { |view| assert_file "app/views/test_app/product_lines/#{view}.html.erb" }
+    %w(index edit new show _form).each do |view|
+      assert_file "app/views/test_app/product_lines/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/test_app/product_lines.html.erb"
 
     # Helpers
@@ -316,13 +312,9 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
                 /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
 
     # Views
-    %w(
-      index
-      edit
-      new
-      show
-      _form
-    ).each { |view| assert_file "app/views/test_app/admin/roles/#{view}.html.erb" }
+    %w(index edit new show _form).each do |view|
+      assert_file "app/views/test_app/admin/roles/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/admin/roles.html.erb"
 
     # Helpers
@@ -389,13 +381,9 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
                 /module TestApp\n  class Admin::User::Special::RolesControllerTest < ActionController::TestCase/
 
     # Views
-    %w(
-      index
-      edit
-      new
-      show
-      _form
-    ).each { |view| assert_file "app/views/test_app/admin/user/special/roles/#{view}.html.erb" }
+    %w(index edit new show _form).each do |view|
+      assert_file "app/views/test_app/admin/user/special/roles/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/admin/user/special/roles.html.erb"
 
     # Helpers
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 38454dfb8b..8cacca668f 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -63,12 +63,9 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_views_are_generated
     run_generator
 
-    %w(
-      index
-      edit
-      new
-      show
-    ).each { |view| assert_file "app/views/users/#{view}.html.erb" }
+    %w(index edit new show).each do |view|
+      assert_file "app/views/users/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/users.html.erb"
   end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index efe47cdfcb..54d5a9db6f 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -67,13 +67,9 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     end
 
     # Views
-    %w(
-      index
-      edit
-      new
-      show
-      _form
-    ).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
+    %w(index edit new show _form).each do |view|
+      assert_file "app/views/product_lines/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/product_lines.html.erb"
 
     # Helpers
@@ -187,13 +183,9 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
                 /class Admin::RolesControllerTest < ActionController::TestCase/
 
     # Views
-    %w(
-      index
-      edit
-      new
-      show
-      _form
-    ).each { |view| assert_file "app/views/admin/roles/#{view}.html.erb" }
+    %w(index edit new show _form).each do |view|
+      assert_file "app/views/admin/roles/#{view}.html.erb"
+    end
     assert_no_file "app/views/layouts/admin/roles.html.erb"
 
     # Helpers
-- 
cgit v1.2.3