Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 42 insertions, 61 deletions

diff --git a/actionpack/test/new_base/base_test.rb b/actionpack/test/new_base/base_test.rb
index 4f46cb6492..d9d552f9e5 100644
--- a/actionpack/test/new_base/base_test.rb
+++ b/actionpack/test/new_base/base_test.rb
@@ -1,8 +1,8 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
 
 # Tests the controller dispatching happy path
-module HappyPath
-  class SimpleDispatchController < ActionController::Base2
+module Dispatching
+  class SimpleController < ActionController::Base
     def index
       render :text => "success"
     end
@@ -10,81 +10,62 @@ module HappyPath
     def modify_response_body
       self.response_body = "success"
     end
-    
+
     def modify_response_body_twice
       ret = (self.response_body = "success") 
       self.response_body = "#{ret}!"
     end
-    
+
     def modify_response_headers
-      
     end
   end
-  
-  class TestSimpleDispatch < SimpleRouteCase
-    
-    get "/happy_path/simple_dispatch/index"
-        
-    test "sets the body" do
+
+  class EmptyController < ActionController::Base ; end
+
+  module Submodule
+    class ContainedEmptyController < ActionController::Base ; end
+  end
+
+  class BaseTest < SimpleRouteCase
+    # :api: plugin
+    test "simple dispatching" do
+      get "/dispatching/simple/index"
+
       assert_body "success"
-    end
-    
-    test "sets the status code" do
       assert_status 200
+      assert_content_type "text/html; charset=utf-8"
+      assert_header "Content-Length", "7"
     end
-    
-    test "sets the content type" do
-      assert_content_type Mime::HTML
-    end
-    
-    test "sets the content length" do
-      assert_header "Content-Length", 7
-    end
-        
-  end
-  
-  # :api: plugin
-  class TestDirectResponseMod < SimpleRouteCase
-    get "/happy_path/simple_dispatch/modify_response_body"
-        
-    test "sets the body" do
+
+    # :api: plugin
+    test "directly modifying response body" do
+      get "/dispatching/simple/modify_response_body"
+
       assert_body "success"
+      assert_header "Content-Length", "7" # setting the body manually sets the content length
     end
-    
-    test "setting the body manually sets the content length" do
-      assert_header "Content-Length", 7
-    end
-  end
-  
-  # :api: plugin
-  class TestDirectResponseModTwice < SimpleRouteCase
-    get "/happy_path/simple_dispatch/modify_response_body_twice"
-    
-    test "self.response_body= returns the body being set" do
+
+    # :api: plugin
+    test "directly modifying response body twice" do
+      get "/dispatching/simple/modify_response_body_twice"
+
       assert_body "success!"
+      assert_header "Content-Length", "8"
     end
-    
-    test "updating the response body updates the content length" do
-      assert_header "Content-Length", 8
-    end
-  end
-end
 
+    test "controller path" do
+      assert_equal 'dispatching/empty', EmptyController.controller_path
+      assert_equal EmptyController.controller_path, EmptyController.new.controller_path
+    end
 
-class EmptyController < ActionController::Base2 ; end
-module Submodule
-  class ContainedEmptyController < ActionController::Base2 ; end
-end
+    test "namespaced controller path" do
+      assert_equal 'dispatching/submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
+      assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
+    end
 
-class ControllerClassTests < Test::Unit::TestCase
-  def test_controller_path
-    assert_equal 'empty', EmptyController.controller_path
-    assert_equal EmptyController.controller_path, EmptyController.new.controller_path
-    assert_equal 'submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
-    assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
+    test "controller name" do
+      assert_equal 'empty', EmptyController.controller_name
+      assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
+    end
   end
-  def test_controller_name
-    assert_equal 'empty', EmptyController.controller_name
-    assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
- end
 end
\ No newline at end of file