mirror of
https://github.com/kaminari/kaminari.git
synced 2022-11-09 13:44:37 -05:00
added test and changed paginate method to return a string
This commit is contained in:
parent
fe5df577f3
commit
80cb34df46
2 changed files with 23 additions and 1 deletions
|
@ -18,7 +18,8 @@ module Kaminari
|
||||||
# * <tt>:remote</tt> - Ajax? (false by default)
|
# * <tt>:remote</tt> - Ajax? (false by default)
|
||||||
# * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
|
# * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
|
||||||
def paginate(scope, options = {}, &block)
|
def paginate(scope, options = {}, &block)
|
||||||
Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
|
paginator = Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
|
||||||
|
paginator.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
21
spec/helpers/action_view_extension_spec.rb
Normal file
21
spec/helpers/action_view_extension_spec.rb
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
require File.expand_path('../spec_helper', File.dirname(__FILE__))
|
||||||
|
include Kaminari::ActionViewExtension
|
||||||
|
|
||||||
|
describe 'Kaminari::ActionViewExtension' do
|
||||||
|
describe '#paginate' do
|
||||||
|
before do
|
||||||
|
@author = User.create! :name => 'author'
|
||||||
|
@books = 2.times.map { @author.books_authored.create! }
|
||||||
|
@books = Book.page(1)
|
||||||
|
end
|
||||||
|
subject { paginate( @books ) }
|
||||||
|
it { should be_a(String) }
|
||||||
|
|
||||||
|
context "escaping the pagination for javascript" do
|
||||||
|
it "should escape for javascript" do
|
||||||
|
lambda { escape_javascript( paginate( @books ) ) }.should_not raise_error
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in a new issue