Merge branch 'master' of github.com:rails/rails

1 files changed, 19 insertions, 19 deletions

diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
index 206ed6e75c..8d7d73b487 100644
--- a/railties/guides/source/testing.textile
+++ b/railties/guides/source/testing.textile
@@ -146,14 +146,14 @@ NOTE: For more information on Rails <i>scaffolding</i>, refer to "Getting Starte
 
 When you use +rails generate scaffold+, for a resource among other things it creates a test stub in the +test/unit+ folder:
 
-<pre>
+<shell>
 $ rails generate scaffold post title:string body:text
 ...
 create  app/models/post.rb
 create  test/unit/post_test.rb
 create  test/fixtures/posts.yml
 ...
-</pre>
+</shell>
 
 The default test stub in +test/unit/post_test.rb+ looks like this:
 
@@ -702,24 +702,24 @@ class UserFlowsTest < ActionController::IntegrationTest
 
   private
 
-    module CustomDsl
-      def browses_site
-        get "/products/all"
-        assert_response :success
-        assert assigns(:products)
-      end
+  module CustomDsl
+    def browses_site
+      get "/products/all"
+      assert_response :success
+      assert assigns(:products)
     end
+  end
 
-    def login(user)
-      open_session do |sess|
-        sess.extend(CustomDsl)
-        u = users(user)
-        sess.https!
-        sess.post "/login", :username => u.username, :password => u.password
-        assert_equal '/welcome', path
-        sess.https!(false)
-      end
+  def login(user)
+    open_session do |sess|
+      sess.extend(CustomDsl)
+      u = users(user)
+      sess.https!
+      sess.post "/login", :username => u.username, :password => u.password
+      assert_equal '/welcome', path
+      sess.https!(false)
     end
+  end
 end
 </ruby>
 
@@ -845,9 +845,9 @@ Testing mailer classes requires some specific tools to do a thorough job.
 
 h4. Keeping the Postman in Check
 
-Your +ActionMailer+ classes -- like every other part of your Rails application -- should be tested to ensure that it is working as expected.
+Your mailer classes -- like every other part of your Rails application -- should be tested to ensure that it is working as expected.
 
-The goals of testing your +ActionMailer+ classes are to ensure that:
+The goals of testing your mailer classes are to ensure that:
 
 * emails are being processed (created and sent)
 * the email content is correct (subject, sender, body, etc)