This commit is contained in:
Akira Matsuda 2015-12-19 06:50:55 +09:00
parent b0ab793ab9
commit 45ee71b74c
4 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ module Kaminari
args = [column_name]
args << options if ActiveRecord::VERSION::STRING < '4.1.0'
# .group returns an OrderdHash that responds to #count
# .group returns an OrderedHash that responds to #count
c = c.count(*args)
if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
c.count

View File

@ -10,7 +10,7 @@ app.config.secret_token = '3b7cd727ee24e8444053437c36cc66c4'
app.config.session_store :cookie_store, :key => '_myapp_session'
app.config.active_support.deprecation = :log
app.config.eager_load = false
# Rais.root
# Rails.root
app.config.root = File.dirname(__FILE__)
Rails.backtrace_cleaner.remove_silencers!
app.initialize!

View File

@ -101,7 +101,7 @@ EOT
last_document.search('.gap').should have(1).item
end
it 'should controll the inner window size' do
it 'should control the inner window size' do
mock_app do
register Kaminari::Helpers::SinatraHelpers
get '/users' do

View File

@ -28,7 +28,7 @@ if defined? ActiveRecord
context "when the scope use conditions on includes" do
it "should keep includes and successfully count the results" do
# Only @author and @author2 have books titled with the title00x partern
# Only @author and @author2 have books titled with the title00x pattern
if ActiveRecord::VERSION::STRING >= "4.1.0"
User.includes(:books_authored).references(:books).where("books.title LIKE 'title00%'").page(1).total_count.should == 2
else