prev_page method doesn't not have to be too intelligent

We mightn't like this behaiviour as it behaves differently from Paginator::PageProxy.
kaminari · Sep 14, 2014 · d524896 · d524896
1 parent adca9b2
commit d524896
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/kaminari/models/page_scope_methods.rb b/lib/kaminari/models/page_scope_methods.rb
@@ -55,7 +55,7 @@ def next_page
 
     # Previous page number in the collection
     def prev_page
-      current_page - 1 unless first_page? || current_page > (total_pages + 1)
+      current_page - 1 unless first_page? || out_of_range?
     end
 
     # First page of the collection?

diff --git a/spec/models/active_record/scopes_spec.rb b/spec/models/active_record/scopes_spec.rb
@@ -200,13 +200,13 @@ class Comment < ActiveRecord::Base; end
             its(:prev_page) { should be_nil }
           end
 
-          context 'page 5' do
-            subject { model_class.page(5) }
-            its(:prev_page) { should == 4 }
+          context 'page 3' do
+            subject { model_class.page(3) }
+            its(:prev_page) { should == 2 }
           end
 
-          context 'page 6' do
-            subject { model_class.page(6) }
+          context 'page 5' do
+            subject { model_class.page(5) }
             its(:prev_page) { should be_nil }
           end
         end

diff --git a/spec/models/array_spec.rb b/spec/models/array_spec.rb
@@ -137,13 +137,13 @@
       its(:prev_page) { should be_nil }
     end
 
-    context 'page 5' do
-      subject { array.page 5 }
-      its(:prev_page) { should == 4 }
+    context 'page 3' do
+      subject { array.page 3 }
+      its(:prev_page) { should == 2 }
     end
 
-    context 'page 6' do
-      subject { array.page 6 }
+    context 'page 5' do
+      subject { array.page 5 }
       its(:prev_page) { should be_nil }
     end
   end