Merge pull request #5073 from opf/fix/search_pagination

fixed pagination
pull/5076/head
Oliver Günther 8 years ago committed by GitHub
commit 7078b5e488
  1. 1
      .gitignore
  2. 2
      app/models/permitted_params.rb
  3. 64
      spec/features/search_spec.rb

1
.gitignore vendored

@ -87,3 +87,4 @@ npm-debug.log*
/.sass-cache/ /.sass-cache/
# Frontend debug log # Frontend debug log
/frontend/npm-debug.log* /frontend/npm-debug.log*
node_modules/

@ -597,6 +597,8 @@ class PermittedParams
permissions: []], permissions: []],
search: [ search: [
:q, :q,
:offset,
:previous,
:scope, :scope,
:all_words, :all_words,
:titles_only, :titles_only,

@ -0,0 +1,64 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'spec_helper'
describe 'Search', type: :feature do
describe 'pagination' do
let(:project) { FactoryGirl.create :project }
let!(:work_packages) do
(1..23).map do |n|
subject = "Subject No. #{n}"
FactoryGirl.create :work_package, subject: subject, project: project, created_at: "2016-11-21 #{n}:00".to_datetime
end
end
let(:query) { "Subject" }
before do
login_as FactoryGirl.create(:admin)
visit "/search?q=#{query}"
end
def expect_range(a, b)
(a..b).each { |n| expect(page.body).to include ("No. #{n}") }
end
it "works" do
expect_range 14, 23
click_on "Next", match: :first
expect_range 4, 13
click_on "Previous", match: :first
expect_range 14, 23
end
end
end
Loading…
Cancel
Save