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/resource_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/resource_generator_test.rb')
-rw-r--r-- | railties/test/generators/resource_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb index addaf83bc8..581d80d60e 100644 --- a/railties/test/generators/resource_generator_test.rb +++ b/railties/test/generators/resource_generator_test.rb @@ -33,7 +33,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase def test_resource_controller_with_pluralized_class_name run_generator assert_file "app/controllers/accounts_controller.rb", /class AccountsController < ApplicationController/ - assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionDispatch::IntegrationTest/ + assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/ assert_file "app/helpers/accounts_helper.rb", /module AccountsHelper/ end |