Use Ruby 1.8 hash syntax

pinetops · Mar 13, 2012 · c1610eb · c1610eb
1 parent ac8469d
commit c1610eb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -26,7 +26,7 @@ def attributes_hash
 
           accessible_attributes.map do |a|
             name = a.name
-            "#{name}: @#{singular_table_name}.#{name}"
+            key_value name, "@#{singular_table_name}.#{name}"
           end.sort.join(', ')
         end
 

diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -75,8 +75,14 @@ def test_functional_tests
     assert_file "test/functional/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, user: { age: @user.age, name: @user.name }/, content)
-      assert_match(/put :update, id: @user, user: { age: @user.age, name: @user.name }/, content)
+
+      if RUBY_VERSION < "1.9"
+        assert_match(/post :create, :user => \{ :age => @user.age, :name => @user.name \}/, content)
+        assert_match(/put :update, :id => @user, :user => \{ :age => @user.age, :name => @user.name \}/, content)
+      else
+        assert_match(/post :create, user: \{ age: @user.age, name: @user.name \}/, content)
+        assert_match(/put :update, id: @user, user: \{ age: @user.age, name: @user.name \}/, content)
+      end
     end
   end
 
@@ -86,8 +92,14 @@ def test_functional_tests_without_attributes
     assert_file "test/functional/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, user: {  }/, content)
-      assert_match(/put :update, id: @user, user: {  }/, content)
+
+      if RUBY_VERSION < "1.9"
+        assert_match(/post :create, :user => \{  \}/, content)
+        assert_match(/put :update, :id => @user, :user => \{  \}/, content)
+      else
+        assert_match(/post :create, user: \{  \}/, content)
+        assert_match(/put :update, id: @user, user: \{  \}/, content)
+      end
     end
   end
 

diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
@@ -64,8 +64,14 @@ def test_scaffold_on_invoke
 
     assert_file "test/functional/product_lines_controller_test.rb" do |test|
       assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
-      assert_match(/post :create, product_line: { title: @product_line.title }/, test)
-      assert_match(/put :update, id: @product_line, product_line: { title: @product_line.title }/, test)
+
+      if RUBY_VERSION < "1.9"
+        assert_match(/post :create, :product_line => \{ :title => @product_line.title \}/, test)
+        assert_match(/put :update, :id => @product_line, :product_line => \{ :title => @product_line.title \}/, test)
+      else
+        assert_match(/post :create, product_line: \{ title: @product_line.title \}/, test)
+        assert_match(/put :update, id: @product_line, product_line: \{ title: @product_line.title \}/, test)
+      end
     end
 
     # Views
@@ -94,8 +100,14 @@ def test_functional_tests_without_attributes
     assert_file "test/functional/product_lines_controller_test.rb" do |content|
       assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, product_line: {  }/, content)
-      assert_match(/put :update, id: @product_line, product_line: {  }/, content)
+
+      if RUBY_VERSION < "1.9"
+        assert_match(/post :create, :product_line => \{  \}/, content)
+        assert_match(/put :update, :id => @product_line, :product_line => \{  \}/, content)
+      else
+        assert_match(/post :create, product_line: \{  \}/, content)
+        assert_match(/put :update, id: @product_line, product_line: \{  \}/, content)
+      end
     end
   end