Merge pull request #2443 from jhawthorn/kaminari_1_1

Require kaminari ~> 1.1 and some related improvements
solidusio · Dec 14, 2017 · 2dc7e80 · 2dc7e80
2 parents b74ad66 + f8b54cf
commit 2dc7e80
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/api/app/views/spree/api/shared/_pagination.json.jbuilder b/api/app/views/spree/api/shared/_pagination.json.jbuilder
@@ -2,4 +2,4 @@ json.count        pagination.count
 json.total_count  pagination.total_count
 json.current_page pagination.current_page
 json.pages        pagination.total_pages
-json.per_page     pagination.limit_value
+json.per_page     pagination.current_per_page
diff --git a/api/solidus_api.gemspec b/api/solidus_api.gemspec
@@ -23,5 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'solidus_core', gem.version
   gem.add_dependency 'responders'
   gem.add_dependency 'jbuilder', '~> 2.6'
-  gem.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  gem.add_dependency 'kaminari-activerecord', '~> 1.1'
 end
diff --git a/backend/lib/spree/backend.rb b/backend/lib/spree/backend.rb
@@ -8,6 +8,7 @@
 require 'font-awesome-rails'
 require 'autoprefixer-rails'
 require 'jbuilder'
+require 'kaminari'
 
 require 'spree_core'
 require 'spree_api'

diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'kaminari', '~> 1.1'
   s.add_dependency 'jbuilder', '~> 2.6'
 
   s.add_dependency 'handlebars_assets', '~> 0.23'

diff --git a/backend/spec/controllers/spree/admin/orders_controller_spec.rb b/backend/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -68,7 +68,7 @@
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }
         expect(assigns[:orders].offset_value).to eq(10)
-        expect(assigns[:orders].limit_value).to eq(10)
+        expect(assigns[:orders].current_per_page).to eq(10)
       end
     end
 

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
@@ -3,7 +3,7 @@
 require 'awesome_nested_set'
 require 'cancan'
 require 'friendly_id'
-require 'kaminari'
+require 'kaminari/activerecord'
 require 'mail'
 require 'monetize'
 require 'paperclip'

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'cancancan', '~> 1.10'
   s.add_dependency 'friendly_id', '~> 5.0'
-  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', ['>= 4.2', '< 6']
   s.add_dependency 'paranoia', '~> 2.4'

diff --git a/frontend/lib/spree/frontend.rb b/frontend/lib/spree/frontend.rb
@@ -4,6 +4,7 @@
 require 'sass-rails'
 require 'font-awesome-rails'
 require 'responders'
+require 'kaminari'
 
 require 'solidus_core'
 require 'solidus_api'

diff --git a/frontend/solidus_frontend.gemspec b/frontend/solidus_frontend.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
-  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'kaminari', '~> 1.1'
 
   s.add_development_dependency 'capybara-accessible'
 end