aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-10-01 02:08:15 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-10-01 02:08:15 +0000
commitec4989618ec08d20024a05500bea088514fbdfd4 (patch)
treea17de6dcd309d041e06f333c89df4e993138128f /railties
parent4af5dbbfccdc4f83b43b4acac246c5e0d8f9199c (diff)
downloadrails-ec4989618ec08d20024a05500bea088514fbdfd4.tar.gz
rails-ec4989618ec08d20024a05500bea088514fbdfd4.tar.bz2
rails-ec4989618ec08d20024a05500bea088514fbdfd4.zip
Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7705 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG5
-rw-r--r--railties/lib/rails_generator/generators/components/model/templates/unit_test.rb2
-rw-r--r--railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb2
-rw-r--r--railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb2
-rw-r--r--railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb2
5 files changed, 5 insertions, 8 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 3f24ca8a01..eaea07a81c 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [DHH]
+
+
*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.1.4 - 1.2.3]
* Fixed that installing plugins from SVN repositories that use trunk/ will work #8188 [evan]
diff --git a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
index b464de47a2..ec8010c8ae 100644
--- a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
@@ -1,8 +1,6 @@
require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
class <%= class_name %>Test < Test::Unit::TestCase
- fixtures :<%= table_name %>
-
# Replace this with your real tests.
def test_truth
assert true
diff --git a/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
index 68a8cf065b..b432f04fce 100644
--- a/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
@@ -1,8 +1,6 @@
require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
class <%= class_name %>ObserverTest < Test::Unit::TestCase
- fixtures :<%= table_name %>
-
# Replace this with your real tests.
def test_truth
assert true
diff --git a/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
index 32bc2cab2b..47697816f3 100644
--- a/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
@@ -5,8 +5,6 @@ require '<%= controller_file_path %>_controller'
class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
- fixtures :<%= table_name %>
-
def setup
@controller = <%= controller_class_name %>Controller.new
@request = ActionController::TestRequest.new
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 825bca412a..992d80e808 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
@@ -5,8 +5,6 @@ require '<%= controller_file_path %>_controller'
class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
- fixtures :<%= table_name %>
-
def setup
@controller = <%= controller_class_name %>Controller.new
@request = ActionController::TestRequest.new