diff options
| author | eileencodes <eileencodes@gmail.com> | 2015-12-13 21:24:40 -0500 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2015-12-13 21:24:40 -0500 |
| commit | 2dd64a7bbb0cb7b65976cb0516d0f338b099a715 (patch) | |
| tree | b98866b4907df6b988b7183474f732cf724a369c /railties/test/generators/scaffold_controller_generator_test.rb | |
| parent | 0b224ddd552dbe87280dfdd1eb7a8f25d7d4e062 (diff) | |
| download | rails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.tar.gz rails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.tar.bz2 rails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.zip | |
Revert "Merge pull request #22569 from seuros/remove-test-case"
This reverts commit 9712a7a12b7f9e4dcef751ceda8a73c3f4beb11f, reversing
changes made to 3e65c3d3886336e9145438cdeacaf4ebec6a48b8.
Reverting because this caused test failures and while we have a followup
branch there is still one failure that happens randomly and isn't
straight forward to fix.
Diffstat (limited to 'railties/test/generators/scaffold_controller_generator_test.rb')
| -rw-r--r-- | railties/test/generators/scaffold_controller_generator_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index 27bc356b10..b4ba101017 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -104,7 +104,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}"] assert_file "test/controllers/users_controller_test.rb" do |content| - assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content) + assert_match(/class UsersControllerTest < ActionController::TestCase/, content) assert_match(/test "should get index"/, content) assert_match(/post :create, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content) assert_match(/patch :update, params: \{ id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content) @@ -115,7 +115,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase run_generator ["User"] assert_file "test/controllers/users_controller_test.rb" do |content| - assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content) + assert_match(/class UsersControllerTest < ActionController::TestCase/, content) assert_match(/test "should get index"/, content) assert_match(/post :create, params: \{ user: \{ \} \}/, content) assert_match(/patch :update, params: \{ id: @user, user: \{ \} \}/, content) @@ -236,7 +236,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}", "--api"] assert_file "test/controllers/users_controller_test.rb" do |content| - assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content) + assert_match(/class UsersControllerTest < ActionController::TestCase/, content) assert_match(/test "should get index"/, content) assert_match(/post :create, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content) assert_match(/patch :update, params: \{ id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content) |