diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index aa1ee15fdc..b9086e91c9 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update scaffolding functional tests to use :id => people(:first) instead of :id => 1. #5612 [evan@protest.net] + * db:test:clone should remove existing tables before reloading the schema. #5607 [sveit@tradeharbor.com] * Fixed migration generation for class names like ACLController #5197 [brad@madriska.com] diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb index 3441b56670..31792767a3 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb @@ -39,7 +39,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase end def test_show<%= suffix %> - get :show<%= suffix %>, :id => 1 + get :show<%= suffix %>, :id => <%= plural_name %>(:first) assert_response :success assert_template 'show' @@ -69,7 +69,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase end def test_edit<%= suffix %> - get :edit<%= suffix %>, :id => 1 + get :edit<%= suffix %>, :id => <%= plural_name %>(:first) assert_response :success assert_template 'edit<%= suffix %>' @@ -79,13 +79,13 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase end def test_update<%= suffix %> - post :update<%= suffix %>, :id => 1 + post :update<%= suffix %>, :id => <%= plural_name %>(:first) assert_response :redirect assert_redirected_to :action => 'show<%= suffix %>', :id => 1 end def test_destroy<%= suffix %> - assert_not_nil <%= model_name %>.find(1) + assert_not_nil <%= model_name %>.find(<%= plural_name %>(:first)) post :destroy, :id => 1 assert_response :redirect |