diff --git a/railties/generators/scaffold/templates/functional_test.rb b/railties/generators/scaffold/templates/functional_test.rb index e82349375b10a48270cc4e32c8cab8b1daf33f2b..b7315cfb84ac2b4865a9f2451b890c9885125cbc 100644 --- a/railties/generators/scaffold/templates/functional_test.rb +++ b/railties/generators/scaffold/templates/functional_test.rb @@ -15,7 +15,6 @@ def setup <% for action in unscaffolded_actions -%> def test_<%= action %> process :<%= action %> - assert_success assert_rendered_file '<%= action %>' end @@ -23,35 +22,25 @@ def test_<%= action %> <% unless suffix -%> def test_index process :index - assert_success assert_rendered_file 'list' end <% end -%> def test_list<%= suffix %> process :list<%= suffix %> - assert_success assert_rendered_file 'list<%= suffix %>' assert_template_has '<%= plural_name %>' end def test_show<%= suffix %> process :show<%= suffix %>, 'id' => 1 - assert_success assert_rendered_file 'show' assert_template_has '<%= singular_name %>' assert_valid_record '<%= singular_name %>' end - def test_show_missing_<%= suffix || 'record' %> - process :show<%= suffix %> - assert_success - assert_rendered_file 'error' - end - def test_new<%= suffix %> process :new<%= suffix %> - assert_success assert_rendered_file 'new<%= suffix %>' assert_template_has '<%= singular_name %>' end @@ -67,29 +56,16 @@ def test_create def test_edit<%= suffix %> process :edit<%= suffix %>, 'id' => 1 - assert_success assert_rendered_file 'edit<%= suffix %>' assert_template_has '<%= singular_name %>' assert_valid_record '<%= singular_name %>' end - def test_edit_missing_<%= suffix || 'record' %> - process :edit<%= suffix %> - assert_success - assert_rendered_file 'error' - end - def test_update<%= suffix %> process :update<%= suffix %>, 'id' => 1 assert_redirected_to :action => 'show<%= suffix %>', :id => 1 end - def test_update_missing_<%= suffix || 'record' %> - process :update<%= suffix %>, '<%= singular_name %>' => {} - assert_success - assert_rendered_file 'error' - end - def test_destroy<%= suffix %> assert_not_nil <%= class_name %>.find(1) @@ -100,10 +76,4 @@ def test_destroy<%= suffix %> <%= singular_name %> = <%= class_name %>.find(1) } end - - def test_destroy_missing_<%= suffix || 'record' %> - process :destroy<%= suffix %> - assert_success - assert_rendered_file 'error' - end end