From 45ee71b74c7a21333e2b05ae8672a0e8c0625e38 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sat, 19 Dec 2015 06:50:55 +0900 Subject: [PATCH] typos --- lib/kaminari/models/active_record_relation_methods.rb | 2 +- spec/fake_app/rails_app.rb | 2 +- spec/helpers/sinatra_helpers_spec.rb | 2 +- .../models/active_record/active_record_relation_methods_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/kaminari/models/active_record_relation_methods.rb b/lib/kaminari/models/active_record_relation_methods.rb index 47d8757..8f7b389 100644 --- a/lib/kaminari/models/active_record_relation_methods.rb +++ b/lib/kaminari/models/active_record_relation_methods.rb @@ -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 diff --git a/spec/fake_app/rails_app.rb b/spec/fake_app/rails_app.rb index 89f7083..266e526 100644 --- a/spec/fake_app/rails_app.rb +++ b/spec/fake_app/rails_app.rb @@ -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! diff --git a/spec/helpers/sinatra_helpers_spec.rb b/spec/helpers/sinatra_helpers_spec.rb index d189531..c736fba 100644 --- a/spec/helpers/sinatra_helpers_spec.rb +++ b/spec/helpers/sinatra_helpers_spec.rb @@ -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 diff --git a/spec/models/active_record/active_record_relation_methods_spec.rb b/spec/models/active_record/active_record_relation_methods_spec.rb index c00f821..93e425b 100644 --- a/spec/models/active_record/active_record_relation_methods_spec.rb +++ b/spec/models/active_record/active_record_relation_methods_spec.rb @@ -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