Merge branch 'master' of https://github.com/rails/rails into performance_test

3 files changed, 49 insertions, 3 deletions

diff --git a/actionpack/test/controller/http_basic_authentication_test.rb b/actionpack/test/controller/http_basic_authentication_test.rb
index 01c650a494..bd3e13e6fa 100644
--- a/actionpack/test/controller/http_basic_authentication_test.rb
+++ b/actionpack/test/controller/http_basic_authentication_test.rb
@@ -6,6 +6,8 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
     before_filter :authenticate_with_request, :only => :display
     before_filter :authenticate_long_credentials, :only => :show
 
+    http_basic_authenticate_with :name => "David", :password => "Goliath", :only => :search
+
     def index
       render :text => "Hello Secret"
     end
@@ -17,6 +19,10 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
     def show
       render :text => 'Only for loooooong credentials'
     end
+    
+    def search
+      render :text => 'All inline'
+    end
 
     private
 
@@ -104,6 +110,16 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
     assert assigns(:logged_in)
     assert_equal 'Definitely Maybe', @response.body
   end
+  
+  test "authenticate with class method" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials('David', 'Goliath')
+    get :search
+    assert_response :success
+
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials('David', 'WRONG!')
+    get :search
+    assert_response :unauthorized
+  end
 
   private
 
diff --git a/actionpack/test/action_dispatch/routing/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb
index e21b271907..b6c08ffc33 100644
--- a/actionpack/test/action_dispatch/routing/mapper_test.rb
+++ b/actionpack/test/dispatch/mapper_test.rb
@@ -25,6 +25,10 @@ module ActionDispatch
         def conditions
           routes.map { |x| x[1] }
         end
+
+        def requirements
+          routes.map { |x| x[2] }
+        end
       end
 
       def test_initialize
@@ -50,8 +54,34 @@ module ActionDispatch
       def test_map_wildcard
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*path', :to => 'pages#show', :as => :page
+        mapper.match '/*path', :to => 'pages#show'
+        assert_equal '/*path(.:format)', fakeset.conditions.first[:path_info]
+        assert_equal(/.+?/, fakeset.requirements.first[:path])
+      end
+
+      def test_map_wildcard_with_other_element
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        mapper.match '/*path/foo/:bar', :to => 'pages#show'
+        assert_equal '/*path/foo/:bar(.:format)', fakeset.conditions.first[:path_info]
+        assert_nil fakeset.requirements.first[:path]
+      end
+
+      def test_map_wildcard_with_multiple_wildcard
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        mapper.match '/*foo/*bar', :to => 'pages#show'
+        assert_equal '/*foo/*bar(.:format)', fakeset.conditions.first[:path_info]
+        assert_nil fakeset.requirements.first[:foo]
+        assert_equal(/.+?/, fakeset.requirements.first[:bar])
+      end
+
+      def test_map_wildcard_with_format_false
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        mapper.match '/*path', :to => 'pages#show', :format => false
         assert_equal '/*path', fakeset.conditions.first[:path_info]
+        assert_nil fakeset.requirements.first[:path]
       end
     end
   end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index aca2fef170..fd1f824a39 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -2720,11 +2720,11 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_time_tag_pubdate_option
-    assert_match /<time.*pubdate="pubdate">.*<\/time>/, time_tag(Time.now, :pubdate => true)
+    assert_match(/<time.*pubdate="pubdate">.*<\/time>/, time_tag(Time.now, :pubdate => true))
   end
 
   def test_time_tag_with_given_text
-    assert_match /<time.*>Right now<\/time>/, time_tag(Time.now, 'Right now')
+    assert_match(/<time.*>Right now<\/time>/, time_tag(Time.now, 'Right now'))
   end
 
   def test_time_tag_with_different_format