aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-03-27 18:58:34 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-03-27 18:58:34 +0530
commit7b9bdd9253c7f8f3b89664ac616ff9bd5ea3ac87 (patch)
tree3fdbf96b45d1270c530d45a46a8b45e85b2f1315
parent2fc32636dc07cd4986e065be2ab3fbded34cbe18 (diff)
parent738e906a021885a0cc864cf781b4cb54a973ef21 (diff)
downloadrails-7b9bdd9253c7f8f3b89664ac616ff9bd5ea3ac87.tar.gz
rails-7b9bdd9253c7f8f3b89664ac616ff9bd5ea3ac87.tar.bz2
rails-7b9bdd9253c7f8f3b89664ac616ff9bd5ea3ac87.zip
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r--railties/guides/source/testing.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
index 4ebdb3edf6..d3f72509c6 100644
--- a/railties/guides/source/testing.textile
+++ b/railties/guides/source/testing.textile
@@ -81,7 +81,7 @@ Each fixture is given a name followed by an indented list of colon-separated key
h5. ERb'in It Up
-ERb allows you embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data.
+ERb allows you to embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data.
<erb>
<% earth_size = 20 %>
@@ -227,7 +227,7 @@ $ rake db:migrate
$ rake db:test:load
</shell>
-Above +rake db:migrate+ runs any pending migrations on the _development_ environment and updates +db/schema.rb+. +rake db:test:load+ recreates the test database from the current +db/schema.rb+. On subsequent attempts, it is a good idea to first run +db:test:prepare+, as it first checks for pending migrations and warns you appropriately.
+The +rake db:migrate+ above runs any pending migrations on the _development_ environment and updates +db/schema.rb+. The +rake db:test:load+ recreates the test database from the current +db/schema.rb+. On subsequent attempts, it is a good idea to first run +db:test:prepare+, as it first checks for pending migrations and warns you appropriately.
NOTE: +db:test:prepare+ will fail with an error if +db/schema.rb+ doesn't exist.