aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2014-05-25 00:43:31 +0200
committerXavier Noria <fxn@hashref.com>2014-05-25 00:45:20 +0200
commit36e3ca6cc526d867613b8dd76026bf2b2c5dd4a4 (patch)
tree8cce6220e4f9603029f1b3154c25546901b8cc00
parent0bd909abea076ee63a93ca1833f712c215e29915 (diff)
downloadrails-36e3ca6cc526d867613b8dd76026bf2b2c5dd4a4.tar.gz
rails-36e3ca6cc526d867613b8dd76026bf2b2c5dd4a4.tar.bz2
rails-36e3ca6cc526d867613b8dd76026bf2b2c5dd4a4.zip
integration tests do not need to load fixtures by hand
I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine.
-rw-r--r--guides/code/getting_started/test/test_helper.rb3
-rw-r--r--guides/source/testing.md5
-rw-r--r--railties/lib/rails/generators/rails/app/templates/test/test_helper.rb3
3 files changed, 0 insertions, 11 deletions
diff --git a/guides/code/getting_started/test/test_helper.rb b/guides/code/getting_started/test/test_helper.rb
index f91a4375dc..ecbaf77ea7 100644
--- a/guides/code/getting_started/test/test_helper.rb
+++ b/guides/code/getting_started/test/test_helper.rb
@@ -6,9 +6,6 @@ class ActiveSupport::TestCase
ActiveRecord::Migration.check_pending!
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
- #
- # Note: You'll currently still have to declare fixtures explicitly in integration tests
- # -- they do not yet inherit this setting
fixtures :all
# Add more helper methods to be used by all tests here...
diff --git a/guides/source/testing.md b/guides/source/testing.md
index e9a5e0d7ab..4149146c4c 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -699,8 +699,6 @@ A simple integration test that exercises multiple controllers:
require 'test_helper'
class UserFlowsTest < ActionDispatch::IntegrationTest
- fixtures :users
-
test "login and browse site" do
# login via https
https!
@@ -727,10 +725,7 @@ Here's an example of multiple sessions and custom DSL in an integration test
require 'test_helper'
class UserFlowsTest < ActionDispatch::IntegrationTest
- fixtures :users
-
test "login and browse site" do
-
# User david logs in
david = login(:david)
# User guest logs in
diff --git a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
index 6b011e577a..87b8fe3516 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
@@ -5,9 +5,6 @@ require 'rails/test_help'
class ActiveSupport::TestCase
<% unless options[:skip_active_record] -%>
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
- #
- # Note: You'll currently still have to declare fixtures explicitly in integration tests
- # -- they do not yet inherit this setting
fixtures :all
<% end -%>