Code cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10180 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 22 insertions, 5 deletions

diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index 19d90fa96..554d52088 100644
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_test.rb
@@ -19,6 +19,13 @@ class AutoCompletesControllerTest < ActionController::TestCase
     assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
   end
 
+  def test_issues_should_accept_term_param
+    get :issues, :project_id => 'ecookbook', :term => 'ReCiPe'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
+  end
+
   def test_issues_should_return_issue_with_given_id
     get :issues, :project_id => 'subproject1', :q => '13'
     assert_response :success
@@ -26,18 +33,28 @@ class AutoCompletesControllerTest < ActionController::TestCase
     assert assigns(:issues).include?(Issue.find(13))
   end
 
-  def test_auto_complete_with_scope_all_and_cross_project_relations
-    Setting.cross_project_issue_relations = '1'
+  def test_auto_complete_with_scope_all_should_search_other_projects
     get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
     assert_response :success
     assert_not_nil assigns(:issues)
     assert assigns(:issues).include?(Issue.find(13))
   end
 
-  def test_auto_complete_with_scope_all_without_cross_project_relations
-    Setting.cross_project_issue_relations = '0'
-    get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
+  def test_auto_complete_without_scope_all_should_not_search_other_projects
+    get :issues, :project_id => 'ecookbook', :q => '13'
     assert_response :success
     assert_equal [], assigns(:issues)
   end
+
+  def test_issues_should_return_json
+    get :issues, :project_id => 'subproject1', :q => '13'
+    assert_response :success
+    json = ActiveSupport::JSON.decode(response.body)
+    assert_kind_of Array, json
+    issue = json.first
+    assert_kind_of Hash, issue
+    assert_equal 13, issue['id']
+    assert_equal 13, issue['value']
+    assert_equal 'Bug #13: Subproject issue two', issue['label']
+  end
 end