Merge pull request #747 from opf/fix/search_work_package_result_link_3303

[FIX] Search work package result link
pull/743/head
Johannes Wollert 11 years ago
commit 879edf1554
  1. 9
      app/models/work_package.rb
  2. 1
      doc/CHANGELOG.md
  3. 89
      spec/controllers/search_controller_spec.rb
  4. 41
      spec/models/work_package/work_package_acts_as_event_spec.rb
  5. 26
      test/functional/search_controller_test.rb

@ -187,10 +187,17 @@ class WorkPackage < ActiveRecord::Base
t
end
end
def self.event_url
Proc.new do |o|
{ controller: :work_packages, action: :show, id: o.id }
end
end
end
acts_as_event title: JournalizedProcs.event_title,
type: JournalizedProcs.event_type
type: JournalizedProcs.event_type,
url: JournalizedProcs.event_url
register_on_journal_formatter(:id, 'parent_id')
register_on_journal_formatter(:fraction, 'estimated_hours')

@ -34,6 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
* `#3234` Fix: [Work package tracking] Sorting of work package statuses does not work
* `#3266` Fix: [Work package tracking] % done in work package status cannot be modified
* `#3291` Fix: Internal error when clicking on member
* `#3303` Fix: [Work package tracking] Search results are linked to wrong location
* `#3331` use permitted_params for group_controller
* `#3363` [Timelines] Autocompleter broken multiple times in timelines edit
* `#3390` [Design] Implement new look for header and project navigation

@ -0,0 +1,89 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2013 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 SearchController do
let!(:project) { FactoryGirl.create(:project,
name: 'eCookbook') }
let(:user) { FactoryGirl.create(:user,
member_in_project: project) }
shared_examples_for 'successful search' do
it { expect(response).to be_success }
it { expect(response).to render_template('index') }
end
before { User.stub(:current).and_return user }
describe 'project search' do
before { get :index }
it_behaves_like 'successful search'
context 'search parameter' do
subject { get :index, q: "cook" }
it_behaves_like 'successful search'
end
end
describe 'work package search' do
let!(:work_package_1) { FactoryGirl.create(:work_package,
subject: "This is a test issue",
project: project) }
let!(:work_package_2) { FactoryGirl.create(:work_package,
subject: "Issue test 2",
project: project,
status: FactoryGirl.create(:closed_status)) }
before { get :index, q: "issue", issues: 1 }
it_behaves_like 'successful search'
describe :result do
it { expect(assigns(:results).count).to be(2) }
it { expect(assigns(:results)).to include(work_package_1) }
it { expect(assigns(:results)).to include(work_package_2) }
describe :view do
render_views
it "marks closed work packages" do
assert_select "dt.work_package-closed" do
assert_select "a", text: Regexp.new(work_package_2.status.name)
end
end
end
end
end
end

@ -0,0 +1,41 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2013 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 WorkPackage do
describe 'acts_as_event' do
let(:stub_work_package) { FactoryGirl.build_stubbed(:work_package) }
describe :event_url do
let(:expected_url) { { controller: :work_packages, action: :show, id: stub_work_package.id } }
it { expect(stub_work_package.event_url).to eq(expected_url) }
end
end
end

@ -44,17 +44,6 @@ class SearchControllerTest < ActionController::TestCase
User.current = nil
end
def test_search_for_projects
get :index
assert_response :success
assert_template 'index'
get :index, :q => "cook"
assert_response :success
assert_template 'index'
assert assigns(:results).include?(Project.find(1))
end
def test_search_all_projects
get :index, :q => 'recipe subproject commit', :submit => 'Search'
assert_response :success
@ -69,21 +58,6 @@ class SearchControllerTest < ActionController::TestCase
assert_tag :a, :content => 'Changesets (5)'
end
def test_search_issues
WorkPackage.find(5).recreate_initial_journal!
WorkPackage.find(8).recreate_initial_journal!
get :index, :q => 'issue', :issues => 1
assert_response :success
assert_template 'index'
assert assigns(:results).include?(WorkPackage.find(8))
assert assigns(:results).include?(WorkPackage.find(5))
assert_select "dt.work_package-closed" do
assert_select "a", :text => /Closed/
end
end
def test_search_project_and_subprojects
get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'
assert_response :success

Loading…
Cancel
Save