aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/system_test_case.rb2
-rw-r--r--guides/source/testing.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb
index 276e3161bd..59faf63ce3 100644
--- a/actionpack/lib/action_dispatch/system_test_case.rb
+++ b/actionpack/lib/action_dispatch/system_test_case.rb
@@ -36,7 +36,7 @@ module ActionDispatch
# end
# end
#
- # When generating an application or scaffold a +application_system_test_case.rb+
+ # When generating an application or scaffold, an +application_system_test_case.rb+
# file will also be generated containing the base class for system testing.
# This is where you can change the driver, add Capybara settings, and other
# configuration for your system tests.
diff --git a/guides/source/testing.md b/guides/source/testing.md
index c7897a42a1..113314a5b8 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -636,11 +636,11 @@ change the default settings.
Rails makes changing the default settings for system test very simple. All
the setup is abstracted away so you can focus on writing your tests.
-When you generate a new application or scaffold, a `application_system_test_case.rb` file
+When you generate a new application or scaffold, an `application_system_test_case.rb` file
is created in the test directory. This is where all the configuration for your
system tests should live.
-If you want to change the default settings you can simple change what the system
+If you want to change the default settings you can simply change what the system
tests are "driven by". Say you want to change the driver from Selenium to
Poltergeist. First add the Poltergeist gem to your Gemfile. Then in your
`application_system_test_case.rb` file do the following:
@@ -685,7 +685,7 @@ This can be helpful for viewing the browser at the point a test failed, or
to view screenshots later for debugging.
Two methods are provided: `take_screenshot` and `take_failed_screenshot`.
-`take_failed_screenshot` is automatically included in `after_teardown` inside
+`take_failed_screenshot` is automatically included in `after_teardown` inside
Rails.
The `take_screenshot` helper method can be included anywhere in your tests to