0
@@ -73,7 +73,7 @@ module ActionController
0
       end
0
 
0
       record    = extract_record(record_or_hash_or_array)
0
-      format    = (options[:action].to_s == "formatted" and record_or_hash_or_array.pop)
0
+      format    = extract_format(record_or_hash_or_array, options)
0
       namespace = extract_namespace(record_or_hash_or_array)
0
       
0
       args = case record_or_hash_or_array
0
@@ -152,6 +152,16 @@ module ActionController
0
         end
0
       end
0
       
0
+      def extract_format(record_or_hash_or_array, options)
0
+        if options[:action].to_s == "formatted" && record_or_hash_or_array.is_a?(Array)
0
+          record_or_hash_or_array.pop
0
+        elsif options[:format]
0
+          options[:format]
0
+        else
0
+          nil
0
+        end
0
+      end
0
+      
0
       def extract_namespace(record_or_hash_or_array)
0
         returning "" do |namespace|
0
           if record_or_hash_or_array.is_a?(Array)

0
@@ -65,13 +65,18 @@ uses_mocha 'polymorphic URL helpers' do
0
       formatted_polymorphic_url([@article, :pdf])
0
     end
0
 
0
-    # TODO: should this work?
0
-    def xtest_format_option
0
+    def test_format_option
0
       @article.save
0
-      expects(:article_url).with(@article, :format => :pdf)
0
+      expects(:article_url).with(@article, :pdf)
0
       polymorphic_url(@article, :format => :pdf)
0
     end
0
 
0
+    def test_id_and_format_option
0
+      @article.save
0
+      expects(:article_url).with(:id => @article, :format => :pdf)
0
+      polymorphic_url(:id => @article, :format => :pdf)
0
+    end
0
+
0
     def test_with_nested
0
       @response.save
0
       expects(:article_response_url).with(@article, @response)