jro_apps/redmine Commit - r8146:bb0cd34f4e2e

Additional tests for SearchController and handle my_projects scope without memberships....

Jean-Philippe Lang -

r8146:bb0cd34f4e2e

parent child

Context file:

r8146:bb0cd34f4e2e

Collapse all files

test/functional/search_controller_test.rb +40 0

             require File.expand_path('../../test_helper', __FILE__)
             require 'search_controller'
             # Re-raise errors caught by the controller.
             class SearchController; def rescue_action(e) raise e end; end
             class SearchControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
                        :issues, :trackers, :issue_statuses,
                        :custom_fields, :custom_values,
                        :repositories, :changesets
               def setup
                 @controller = SearchController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 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', :all_words => ''
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Issue.find(2))
                 assert assigns(:results).include?(Issue.find(5))
                 assert assigns(:results).include?(Changeset.find(101))
                 assert_tag :dt, :attributes => { :class => /issue/ },
                                 :child => { :tag => 'a',  :content => /Add ingredients categories/ },
                                 :sibling => { :tag => 'dd', :content => /should be classified by categories/ }
                 assert assigns(:results_by_type).is_a?(Hash)
                 assert_equal 5, assigns(:results_by_type)['changesets']
                 assert_tag :a, :content => 'Changesets (5)'
               end
               def test_search_issues
                 get :index, :q => 'issue', :issues => 1
                 assert_response :success
                 assert_template 'index'
                 assert_equal true, assigns(:all_words)
                 assert_equal false, assigns(:titles_only)
                 assert assigns(:results).include?(Issue.find(8))
                 assert assigns(:results).include?(Issue.find(5))
                 assert_tag :dt, :attributes => { :class => /issue closed/ },
                                 :child => { :tag => 'a',  :content => /Closed/ }
               end
+              def test_search_all_projects_with_scope_param
+                get :index, :q => 'issue', :scope => 'all'
+                assert_response :success
+                assert_template 'index'
+                assert assigns(:results).present?
+              end
+              def test_search_my_projects
+                @request.session[:user_id] = 2
+                get :index, :id => 1, :q => 'recipe subproject', :scope => 'my_projects', :all_words => ''
+                assert_response :success
+                assert_template 'index'
+                assert assigns(:results).include?(Issue.find(1))
+                assert !assigns(:results).include?(Issue.find(5))
+              end
+              def test_search_my_projects_without_memberships
+                # anonymous user has no memberships
+                get :index, :id => 1, :q => 'recipe subproject', :scope => 'my_projects', :all_words => ''
+                assert_response :success
+                assert_template 'index'
+                assert assigns(:results).empty?
+              end
               def test_search_project_and_subprojects
                 get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :all_words => ''
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Issue.find(1))
                 assert assigns(:results).include?(Issue.find(5))
               end
               def test_search_without_searchable_custom_fields
                 CustomField.update_all "searchable = #{ActiveRecord::Base.connection.quoted_false}"
                 get :index, :id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:project)
                 get :index, :id => 1, :q => "can"
                 assert_response :success
                 assert_template 'index'
               end
               def test_search_with_searchable_custom_fields
                 get :index, :id => 1, :q => "stringforcustomfield"
                 assert_response :success
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
                 assert results.include?(Issue.find(7))
               end
               def test_search_all_words
                 # 'all words' is on by default
                 get :index, :id => 1, :q => 'recipe updating saving', :all_words => '1'
                 assert_equal true, assigns(:all_words)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
                 assert results.include?(Issue.find(3))
               end
               def test_search_one_of_the_words
                 get :index, :id => 1, :q => 'recipe updating saving', :all_words => ''
                 assert_equal false, assigns(:all_words)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 3, results.size
                 assert results.include?(Issue.find(3))
               end
               def test_search_titles_only_without_result
                 get :index, :id => 1, :q => 'recipe updating saving', :titles_only => '1'
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 0, results.size
               end
               def test_search_titles_only
                 get :index, :id => 1, :q => 'recipe', :titles_only => '1'
                 assert_equal true, assigns(:titles_only)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 2, results.size
               end
               def test_search_content
                 Issue.update_all("description = 'This is a searchkeywordinthecontent'", "id=1")
                 get :index, :id => 1, :q => 'searchkeywordinthecontent', :titles_only => ''
                 assert_equal false, assigns(:titles_only)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
               end
+              def test_search_with_offset
+                get :index, :q => 'coo', :offset => '20080806073000'
+                assert_response :success
+                results = assigns(:results)
+                assert results.any?
+                assert results.map(&:event_datetime).max < '20080806T073000'.to_time
+              end
+              def test_search_previous_with_offset
+                get :index, :q => 'coo', :offset => '20080806073000', :previous => '1'
+                assert_response :success
+                results = assigns(:results)
+                assert results.any?
+                assert results.map(&:event_datetime).min >= '20080806T073000'.to_time
+              end
               def test_search_with_invalid_project_id
                 get :index, :id => 195, :q => 'recipe'
                 assert_response 404
                 assert_nil assigns(:results)
               end
               def test_quick_jump_to_issue
                 # issue of a public project
                 get :index, :q => "3"
                 assert_redirected_to '/issues/3'
                 # issue of a private project
                 get :index, :q => "4"
                 assert_response :success
                 assert_template 'index'
               end
               def test_large_integer
                 get :index, :q => '4615713488'
                 assert_response :success
                 assert_template 'index'
               end
               def test_tokens_with_quotes
                 get :index, :id => 1, :q => '"good bye" hello "bye bye"'
                 assert_equal ["good bye", "hello", "bye bye"], assigns(:tokens)
               end
             end

vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb +5 0

             # 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.
             module Redmine
               module Acts
                 module Searchable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     # Options:
                     # * :columns - a column or an array of columns to search
                     # * :project_key - project foreign key (default to project_id)
                     # * :date_column - name of the datetime column (default to created_on)
                     # * :sort_order - name of the column used to sort results (default to :date_column or created_on)
                     # * :permission - permission required to search the model (default to :view_"objects")
                     def acts_as_searchable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
                       cattr_accessor :searchable_options
                       self.searchable_options = options
                       if searchable_options[:columns].nil?
                         raise 'No searchable column defined.'
                       elsif !searchable_options[:columns].is_a?(Array)
                         searchable_options[:columns] = [] << searchable_options[:columns]
                       end
                       searchable_options[:project_key] ||= "#{table_name}.project_id"
                       searchable_options[:date_column] ||= "#{table_name}.created_on"
                       searchable_options[:order_column] ||= searchable_options[:date_column]
                       # Should we search custom fields on this model ?
                       searchable_options[:search_custom_fields] = !reflect_on_association(:custom_values).nil?
                       send :include, Redmine::Acts::Searchable::InstanceMethods
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     module ClassMethods
                       # Searches the model for the given tokens
                       # projects argument can be either nil (will search all projects), a project or an array of projects
                       # Returns the results and the results count
                       def search(tokens, projects=nil, options={})
+                        if projects.is_a?(Array) && projects.empty?
+                          # no results
+                          return [[], 0]
+                        end
                         # TODO: make user an argument
                         user = User.current
                         tokens = [] << tokens unless tokens.is_a?(Array)
                         projects = [] << projects unless projects.nil? || projects.is_a?(Array)
                         find_options = {:include => searchable_options[:include]}
                         find_options[:order] = "#{searchable_options[:order_column]} " + (options[:before] ? 'DESC' : 'ASC')
                         limit_options = {}
                         limit_options[:limit] = options[:limit] if options[:limit]
                         if options[:offset]
                           limit_options[:conditions] = "(#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
                         end
                         columns = searchable_options[:columns]
                         columns = columns[0..0] if options[:titles_only]
                         token_clauses = columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}
                         if !options[:titles_only] && searchable_options[:search_custom_fields]
                           searchable_custom_field_ids = CustomField.find(:all,
                                                                          :select => 'id',
                                                                          :conditions => { :type => "#{self.name}CustomField",
                                                                                           :searchable => true }).collect(&:id)
                           if searchable_custom_field_ids.any?
                             custom_field_sql = "#{table_name}.id IN (SELECT customized_id FROM #{CustomValue.table_name}" +
                               " WHERE customized_type='#{self.name}' AND customized_id=#{table_name}.id AND LOWER(value) LIKE ?" +
                               " AND #{CustomValue.table_name}.custom_field_id IN (#{searchable_custom_field_ids.join(',')}))"
                             token_clauses << custom_field_sql
                           end
                         end
                         sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
                         find_options[:conditions] = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort]
                         scope = self
                         project_conditions = []
                         if searchable_options.has_key?(:permission)
                           project_conditions << Project.allowed_to_condition(user, searchable_options[:permission] || :view_project)
                         elsif respond_to?(:visible)
                           scope = scope.visible(user)
                         else
                           ActiveSupport::Deprecation.warn "acts_as_searchable with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
                           project_conditions << Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym)
                         end
                         # TODO: use visible scope options instead
                         project_conditions << "#{searchable_options[:project_key]} IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
                         project_conditions = project_conditions.empty? ? nil : project_conditions.join(' AND ')
                         results = []
                         results_count = 0
                         with_scope(:find => {:conditions => project_conditions}) do
                           with_scope(:find => find_options) do
                             results_count = scope.count(:all)
                             results = scope.find(:all, limit_options)
                           end
                         end
                         [results, results_count]
                       end
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages