Permalink
Browse files

Removed redundent tests for success and removed the tests for missing…

… records that were failing out the gates

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0802ca7 commit 0a97c05ba0fdc8a1179c10869025c9fffcf69d13 @dhh dhh committed Dec 15, 2004
Showing with 0 additions and 30 deletions.
  1. +0 −30 railties/generators/scaffold/templates/functional_test.rb
@@ -15,43 +15,32 @@ def setup
<% for action in unscaffolded_actions -%>
def test_<%= action %>
process :<%= action %>
- assert_success
assert_rendered_file '<%= action %>'
end
<% end -%>
<% 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

0 comments on commit 0a97c05

Please sign in to comment.