From 2ebea1c02d10e0fea26bd98d297a8f4d41dc1aff Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 31 Jan 2010 16:27:24 +1100
Subject: deOMGifying Railties, Active Support, and Action Pack

---
 actionpack/test/abstract/layouts_test.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'actionpack/test/abstract/layouts_test.rb')

diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index bf02e5a864..b6d89ea489 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -13,7 +13,7 @@ module AbstractControllerTests
         "layouts/hello_override.erb"            => "With Override <%= yield %>",
         "layouts/abstract_controller_tests/layouts/with_string_implied_child.erb" =>
                                                    "With Implied <%= yield %>",
-        "layouts/omg.erb"                       => "OMGHI2U <%= yield %>",
+        "layouts/overwrite.erb"                  => "Overwrite <%= yield %>",
         "layouts/with_false_layout.erb"         => "False Layout <%= yield %>"
       )]
     end
@@ -42,7 +42,7 @@ module AbstractControllerTests
       end
 
       def overwrite_string
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "omg"
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "overwrite"
       end
 
       def overwrite_skip
@@ -68,7 +68,7 @@ module AbstractControllerTests
     end
 
     class WithProc < Base
-      layout proc { |c| "omg" }
+      layout proc { |c| "overwrite" }
 
       def index
         render :_template => ActionView::Template::Text.new("Hello proc!")
@@ -83,7 +83,7 @@ module AbstractControllerTests
       end
     private  
       def hello
-        "omg"
+        "overwrite"
       end
     end
     
@@ -122,7 +122,7 @@ module AbstractControllerTests
     end    
     
     class WithSymbolAndNoMethod < Base
-      layout :omg_no_method
+      layout :no_method
       
       def index
         render :_template => ActionView::Template::Text.new("Hello boom!")
@@ -175,7 +175,7 @@ module AbstractControllerTests
       test "when layout is overwriten by string in render, render new layout" do
         controller = WithString.new
         controller.process(:overwrite_string)
-        assert_equal "OMGHI2U Hello string!", controller.response_body
+        assert_equal "Overwrite Hello string!", controller.response_body
       end
 
       test "when layout is overwriten by false in render, render no layout" do
@@ -209,13 +209,13 @@ module AbstractControllerTests
       test "when layout is specified as a proc, call it and use the layout returned" do
         controller = WithProc.new
         controller.process(:index)
-        assert_equal "OMGHI2U Hello proc!", controller.response_body
+        assert_equal "Overwrite Hello proc!", controller.response_body
       end
       
       test "when layout is specified as a symbol, call the requested method and use the layout returned" do
         controller = WithSymbol.new
         controller.process(:index)
-        assert_equal "OMGHI2U Hello symbol!", controller.response_body
+        assert_equal "Overwrite Hello symbol!", controller.response_body
       end
       
       test "when layout is specified as a symbol and the method returns nil, don't use a layout" do
@@ -266,7 +266,7 @@ module AbstractControllerTests
       test "raises an exception when specifying layout true" do
         assert_raises ArgumentError do
           Object.class_eval do
-            class ::BadOmgFailLolLayout < AbstractControllerTests::Layouts::Base
+            class ::BadFailLayout < AbstractControllerTests::Layouts::Base
               layout true
             end
           end
-- 
cgit v1.2.3