aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_unit
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-02-20 16:35:49 -0500
committerGitHub <noreply@github.com>2017-02-20 16:35:49 -0500
commit2ee146af6ba9193862b76306685eccee79fefef9 (patch)
treed5e20c06d020731e56ccac566e73b72130a85119 /railties/lib/rails/test_unit
parentff326e745614593530ee64b67ac21bf14e3d41b3 (diff)
parent42a6dbdf8480b96c4a0ac6e1dab215ae9dd77d1d (diff)
downloadrails-2ee146af6ba9193862b76306685eccee79fefef9.tar.gz
rails-2ee146af6ba9193862b76306685eccee79fefef9.tar.bz2
rails-2ee146af6ba9193862b76306685eccee79fefef9.zip
Merge pull request #26703 from eileencodes/rails_system_tests
WIP: Capybara Integration with Rails (AKA System Tests)
Diffstat (limited to 'railties/lib/rails/test_unit')
-rw-r--r--railties/lib/rails/test_unit/railtie.rb1
-rw-r--r--railties/lib/rails/test_unit/testing.rake5
2 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 746120e6a1..9cc3f73a9c 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -11,6 +11,7 @@ module Rails
fixture_replacement: nil
c.integration_tool :test_unit
+ c.system_tests :test_unit
end
initializer "test_unit.line_filtering" do
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 4c157c1262..4dde3d3c97 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -47,4 +47,9 @@ namespace :test do
$: << "test"
Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
end
+
+ task system: "test:prepare" do
+ $: << "test"
+ Minitest.rake_run(["test/system"])
+ end
end