diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2017-03-25 11:26:31 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2017-03-25 11:26:31 +0000 |
| commit | 09436fb6d6d188739b40ef120b4344106d81caf9 (patch) | |
| tree | a738b96e5f29463680f8fd3fd5016481a1aaa3ae /guides | |
| parent | 296d024b4e91c4891ae0b010249193513e63b921 (diff) | |
| parent | 3b51c8a591b0b79fa6d9f42f948b6b733dfae936 (diff) | |
| download | rails-09436fb6d6d188739b40ef120b4344106d81caf9.tar.gz rails-09436fb6d6d188739b40ef120b4344106d81caf9.tar.bz2 rails-09436fb6d6d188739b40ef120b4344106d81caf9.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/configuring.md | 2 | ||||
| -rw-r--r-- | guides/source/testing.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index a4f3882124..ae70b06996 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -32,7 +32,7 @@ Configuring Rails Components In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The configuration file `config/application.rb` and environment-specific configuration files (such as `config/environments/production.rb`) allow you to specify the various settings that you want to pass down to all of the components. -For example, the `config/application.rb` file includes this setting: +For example, you could add this setting to `config/application.rb` file: ```ruby config.time_zone = 'Central Time (US & Canada)' diff --git a/guides/source/testing.md b/guides/source/testing.md index 27f5b5e916..7741834153 100644 --- a/guides/source/testing.md +++ b/guides/source/testing.md @@ -644,7 +644,7 @@ system tests should live. 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 +Poltergeist. First add the `poltergeist` gem to your Gemfile. Then in your `application_system_test_case.rb` file do the following: ```ruby @@ -722,7 +722,7 @@ class ArticlesTest < ApplicationSystemTestCase end ``` -The test should see that there is an h1 on the articles index and pass. +The test should see that there is an `h1` on the articles index page and pass. Run the system tests. @@ -763,7 +763,7 @@ text. Once the fields are filled in, "Create Article" is clicked on which will send a POST request to create the new article in the database. We will be redirected back to the the articles index page and there we assert -that the text from the article title is on the articles index page. +that the text from the new article's title is on the articles index page. #### Taking it further |