Navigation Menu

Skip to content

Commit

Permalink
Remove WillPaginate tests and bundle to ActiveRecord 3.1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
metaskills committed Dec 1, 2011
1 parent d04a211 commit d4f3633
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 16 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Expand Up @@ -7,10 +7,9 @@ ar_version = spec.dependencies.detect{ |d|d.name == 'activerecord' }.requirement


gem 'sqlite3', '1.3.4' gem 'sqlite3', '1.3.4'
gem 'activerecord', ar_version, :require => 'active_record' gem 'activerecord', ar_version, :require => 'active_record'
gem 'will_paginate', '2.3.16'


group :development do group :development do
gem 'rake', '0.8.7' gem 'rake', '~> 0.9.2'
end end


group :test do group :test do
Expand Down
2 changes: 1 addition & 1 deletion grouped_scope.gemspec
Expand Up @@ -15,6 +15,6 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib'] s.require_paths = ['lib']
s.rdoc_options = ['--charset=UTF-8'] s.rdoc_options = ['--charset=UTF-8']
s.add_dependency 'activerecord', '~> 2.3.14' s.add_dependency 'activerecord', '~> 3.1.3'
end end


11 changes: 0 additions & 11 deletions test/grouped_scope/has_many_association_test.rb
Expand Up @@ -94,17 +94,6 @@ class GroupedScope::HasManyAssociationTest < GroupedScope::TestCase
end end
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


end end
Expand Down
2 changes: 0 additions & 2 deletions test/helper.rb
Expand Up @@ -6,8 +6,6 @@
require 'minitest/autorun' require 'minitest/autorun'
require 'factories' require 'factories'


WillPaginate.enable_activerecord

ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/debug.log') ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/debug.log')
ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:' ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
ActiveRecord::Base.connection.class.class_eval do ActiveRecord::Base.connection.class.class_eval do
Expand Down

0 comments on commit d4f3633

Please sign in to comment.