TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #5415 from rafaelfranca/refactor

Browse Source 
Refactor the test_unit scaffold generator to use the key_value method
This commit is contained in:
José Valim 2012-03-13 14:20:43 -07:00
commit 2d3550c4be
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
View File

@ -26,7 +26,7 @@ def attributes_hash
accessible_attributes.map do |a| accessible_attributes.map do |a|
name = a.name name = a.name
"#{name}: @#{singular_table_name}.#{name}" key_value name, "@#{singular_table_name}.#{name}"
end.sort.join(', ') end.sort.join(', ')
end end

8
railties/test/generators/scaffold_controller_generator_test.rb
View File

@ -75,8 +75,8 @@ def test_functional_tests
assert_file "test/functional/users_controller_test.rb" do |content| assert_file "test/functional/users_controller_test.rb" do |content|
assert_match(/class UsersControllerTest < ActionController::TestCase/, content) assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
assert_match(/test "should get index"/, content) assert_match(/test "should get index"/, content)
assert_match(/post :create, user: { age: @user.age, name: @user.name }/, 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) assert_match(/put :update, id: @user, user: \{ age: @user.age, name: @user.name \}/, content)
end end
end end
@ -86,8 +86,8 @@ def test_functional_tests_without_attributes
assert_file "test/functional/users_controller_test.rb" do |content| assert_file "test/functional/users_controller_test.rb" do |content|
assert_match(/class UsersControllerTest < ActionController::TestCase/, content) assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
assert_match(/test "should get index"/, content) assert_match(/test "should get index"/, content)
assert_match(/post :create, user: { }/, content) assert_match(/post :create, user: \{ \}/, content)
assert_match(/put :update, id: @user, user: { }/, content) assert_match(/put :update, id: @user, user: \{ \}/, content)
end end
end end

8
railties/test/generators/scaffold_generator_test.rb
View File

@ -64,8 +64,8 @@ def test_scaffold_on_invoke
assert_file "test/functional/product_lines_controller_test.rb" do |test| assert_file "test/functional/product_lines_controller_test.rb" do |test|
assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test) assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
assert_match(/post :create, product_line: { title: @product_line.title }/, 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) assert_match(/put :update, id: @product_line, product_line: \{ title: @product_line.title \}/, test)
end end
# Views # Views
@ -94,8 +94,8 @@ def test_functional_tests_without_attributes
assert_file "test/functional/product_lines_controller_test.rb" do |content| assert_file "test/functional/product_lines_controller_test.rb" do |content|
assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, content) assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, content)
assert_match(/test "should get index"/, content) assert_match(/test "should get index"/, content)
assert_match(/post :create, product_line: { }/, content) assert_match(/post :create, product_line: \{ \}/, content)
assert_match(/put :update, id: @product_line, product_line: { }/, content) assert_match(/put :update, id: @product_line, product_line: \{ \}/, content)
end end
end end