aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorCesar Carruitero <cesar@mozilla.pe>2013-07-02 06:29:09 -0500
committerCesar Carruitero <cesar@mozilla.pe>2013-07-02 06:34:02 -0500
commita028b16db88c3634189bbf5c282b7d71decaf71d (patch)
tree2f8b2c0ab60771d3c7d0964dd3c08c30770c1444 /guides
parent20b3704524d5f57b4ad51c6278519ad65a7a7e64 (diff)
downloadrails-a028b16db88c3634189bbf5c282b7d71decaf71d.tar.gz
rails-a028b16db88c3634189bbf5c282b7d71decaf71d.tar.bz2
rails-a028b16db88c3634189bbf5c282b7d71decaf71d.zip
update test names in testing guide [ci-skip]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/testing.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 416a8b592f..62c9835fa4 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -92,7 +92,7 @@ user_<%= n %>:
#### Fixtures in Action
-Rails by default automatically loads all fixtures from the `test/fixtures` folder for your unit and functional test. Loading involves three steps:
+Rails by default automatically loads all fixtures from the `test/fixtures` folder for your models and controllers test. Loading involves three steps:
* Remove any existing data from the table corresponding to the fixture
* Load the fixture data into the table
@@ -116,7 +116,7 @@ email(david.girlfriend.email, david.location_tonight)
Unit Testing your Models
------------------------
-In Rails, unit tests are what you write to test your models.
+In Rails, models tests are what you write to test your models.
For this guide we will be using Rails _scaffolding_. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practices. I will be using examples from this generated code and will be supplementing it with additional examples where necessary.