0
@@ -56,8 +56,8 @@ module WillPaginate
0
       protected
0
         
0
         def wp_parse_options(options) #:nodoc:
0
-          raise ArgumentError, 'parameter hash expected' unless options.respond_to? :symbolize_keys
0
-          options = options.symbolize_keys
0
+          raise ArgumentError, 'parameter hash expected' unless Hash === options
0
+          # options = options.symbolize_keys
0
           raise ArgumentError, ':page parameter required' unless options.key? :page
0
           
0
           if options[:count] and options[:total_entries]
0
@@ -67,7 +67,8 @@ module WillPaginate
0
           page     = options[:page] || 1
0
           per_page = options[:per_page] || self.per_page
0
           total    = options[:total_entries]
0
-          [page, per_page, total]
0
+          
0
+          return [page, per_page, total]
0
         end
0
         
0
     end

0
@@ -28,10 +28,6 @@ class FinderTest < ActiveRecordTestCase
0
   end
0
 
0
   def test_parameter_api
0
-    # :page parameter in options is required!
0
-    assert_raise(ArgumentError){ Topic.paginate }
0
-    assert_raise(ArgumentError){ Topic.paginate({}) }
0
-    
0
     # explicit :all should not break anything
0
     assert_equal Topic.paginate(:page => nil), Topic.paginate(:all, :page => 1)
0
 
0
@@ -263,13 +259,6 @@ class FinderTest < ActiveRecordTestCase
0
   end
0
 
0
   ## misc ##
0
-
0
-  def test_count_and_total_entries_options_are_mutually_exclusive
0
-    e = assert_raise ArgumentError do
0
-      Developer.paginate :page => 1, :count => {}, :total_entries => 1
0
-    end
0
-    assert_match /exclusive/, e.to_s
0
-  end
0
   
0
   def test_readonly
0
     assert_nothing_raised { Developer.paginate :readonly => true, :page => 1 }
0
@@ -397,20 +386,5 @@ class FinderTest < ActiveRecordTestCase
0
       Developer.paginate(options)
0
       assert_equal options, options_before
0
     end
0
-
0
-    def test_paginated_each
0
-      collection = stub('collection', :size => 5, :empty? => false, :per_page => 5)
0
-      collection.expects(:each).times(2).returns(collection)
0
-      last_collection = stub('collection', :size => 4, :empty? => false, :per_page => 5)
0
-      last_collection.expects(:each).returns(last_collection)
0
-      
0
-      params = { :order => 'id', :total_entries => 0 }
0
-      
0
-      Developer.expects(:paginate).with(params.merge(:page => 2)).returns(collection)
0
-      Developer.expects(:paginate).with(params.merge(:page => 3)).returns(collection)
0
-      Developer.expects(:paginate).with(params.merge(:page => 4)).returns(last_collection)
0
-      
0
-      assert_equal 14, Developer.paginated_each(:page => '2') { }
0
-    end
0
   end
0
 end