This commit is contained in:
Sam 2013-05-13 10:51:45 +10:00
parent 30501e943c
commit 98d9f174ae
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@ require_dependency 'search'
class SearchController < ApplicationController class SearchController < ApplicationController
def query def query
search_result = Search.query(params[:term], params[:type_filter], SiteSetting.min_search_term_length) search_result = Search.query(params[:term], current_user, params[:type_filter], SiteSetting.min_search_term_length)
render_json_dump(search_result.as_json) render_json_dump(search_result.as_json)
end end

View File

@ -3,12 +3,12 @@ require 'spec_helper'
describe SearchController do describe SearchController do
it 'performs the query' do it 'performs the query' do
Search.expects(:query).with('test', nil, 3) Search.expects(:query).with('test', nil, nil, 3)
xhr :get, :query, term: 'test' xhr :get, :query, term: 'test'
end end
it 'performs the query with a filter' do it 'performs the query with a filter' do
Search.expects(:query).with('test', 'topic', 3) Search.expects(:query).with('test', nil, 'topic', 3)
xhr :get, :query, term: 'test', type_filter: 'topic' xhr :get, :query, term: 'test', type_filter: 'topic'
end end