From fdea829952882a6008fb36e27186f98809af831d Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 17 May 2011 02:39:40 +0000 Subject: [PATCH] remove trailing white-spaces from unit search test. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5814 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/search_test.rb | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb index 2cf041772..e60ff19b6 100644 --- a/test/unit/search_test.rb +++ b/test/unit/search_test.rb @@ -1,16 +1,16 @@ -# redMine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # 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. @@ -19,7 +19,7 @@ require File.expand_path('../../test_helper', __FILE__) class SearchTest < ActiveSupport::TestCase fixtures :users, - :members, + :members, :member_roles, :projects, :roles, @@ -38,23 +38,23 @@ class SearchTest < ActiveSupport::TestCase @changeset_keyword = '%very first commit%' @changeset = Changeset.find(100) end - + def test_search_by_anonymous User.current = nil - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first assert r.include?(@changeset) - + # Removes the :view_changesets permission from Anonymous role remove_permission Role.anonymous, :view_changesets - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first assert !r.include?(@changeset) - + # Make the project private @project.update_attribute :is_public, false r = Issue.search(@issue_keyword).first @@ -62,24 +62,24 @@ class SearchTest < ActiveSupport::TestCase r = Changeset.search(@changeset_keyword).first assert !r.include?(@changeset) end - + def test_search_by_user User.current = User.find_by_login('rhill') assert User.current.memberships.empty? - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first assert r.include?(@changeset) - + # Removes the :view_changesets permission from Non member role remove_permission Role.non_member, :view_changesets - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first assert !r.include?(@changeset) - + # Make the project private @project.update_attribute :is_public, false r = Issue.search(@issue_keyword).first @@ -87,11 +87,11 @@ class SearchTest < ActiveSupport::TestCase r = Changeset.search(@changeset_keyword).first assert !r.include?(@changeset) end - + def test_search_by_allowed_member User.current = User.find_by_login('jsmith') assert User.current.projects.include?(@project) - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first @@ -109,10 +109,10 @@ class SearchTest < ActiveSupport::TestCase # Removes the :view_changesets permission from user's and non member role remove_permission Role.find(1), :view_changesets remove_permission Role.non_member, :view_changesets - + User.current = User.find_by_login('jsmith') assert User.current.projects.include?(@project) - + r = Issue.search(@issue_keyword).first assert r.include?(@issue) r = Changeset.search(@changeset_keyword).first @@ -125,18 +125,18 @@ class SearchTest < ActiveSupport::TestCase r = Changeset.search(@changeset_keyword).first assert !r.include?(@changeset) end - + def test_search_issue_with_multiple_hits_in_journals i = Issue.find(1) assert_equal 2, i.journals.count(:all, :conditions => "notes LIKE '%notes%'") - + r = Issue.search('%notes%').first assert_equal 1, r.size assert_equal i, r.first end - + private - + def remove_permission(role, permission) role.permissions = role.permissions - [ permission ] role.save