diff --git a/Gemfile b/Gemfile index 4783e3b..a961ac4 100644 --- a/Gemfile +++ b/Gemfile @@ -7,10 +7,9 @@ ar_version = spec.dependencies.detect{ |d|d.name == 'activerecord' }.requirement gem 'sqlite3', '1.3.4' gem 'activerecord', ar_version, :require => 'active_record' -gem 'will_paginate', '2.3.16' group :development do - gem 'rake', '0.8.7' + gem 'rake', '~> 0.9.2' end group :test do diff --git a/grouped_scope.gemspec b/grouped_scope.gemspec index a2bd4d5..f127b14 100644 --- a/grouped_scope.gemspec +++ b/grouped_scope.gemspec @@ -15,6 +15,6 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ['lib'] s.rdoc_options = ['--charset=UTF-8'] - s.add_dependency 'activerecord', '~> 2.3.14' + s.add_dependency 'activerecord', '~> 3.1.3' end diff --git a/test/grouped_scope/has_many_association_test.rb b/test/grouped_scope/has_many_association_test.rb index e526420..a8c489f 100644 --- a/test/grouped_scope/has_many_association_test.rb +++ b/test/grouped_scope/has_many_association_test.rb @@ -94,17 +94,6 @@ class GroupedScope::HasManyAssociationTest < GroupedScope::TestCase end end - describe 'with will paginate' do - - it 'use group reflection, named scope, and paginate SQL' do - where_ends_with_limits = /WHERE.*LIMIT 2 OFFSET 0/ - assert_sql(select_from_reports, where_for_groups, where_for_urgent_body, where_for_urgent_title, where_ends_with_limits) do - @e2.group.reports.with_urgent_title.with_urgent_body.paginate(:page=>1,:per_page=>2) - end - end - - end - end end diff --git a/test/helper.rb b/test/helper.rb index dd0add1..e0d19e5 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -6,8 +6,6 @@ require 'minitest/autorun' require 'factories' -WillPaginate.enable_activerecord - ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/debug.log') ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:' ActiveRecord::Base.connection.class.class_eval do