From ffbbccb7ea3e3c667b4cfdeaeeedfbef0a5f190a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 18 Jan 2014 15:02:53 +0200
Subject: Fix search autocomplete

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 spec/helpers/search_helper_spec.rb | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'spec/helpers/search_helper_spec.rb')

diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index 33ecb980202..d04945dfe35 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -13,52 +13,41 @@ describe SearchHelper do
       end
 
       it "it returns nil" do
-        search_autocomplete_source.should be_nil
+        search_autocomplete_opts("q").should be_nil
       end
     end
 
     context "with a user" do
       let(:user)   { create(:user) }
-      let(:result) { JSON.parse(search_autocomplete_source) }
 
       before do
         allow(self).to receive(:current_user).and_return(user)
       end
 
       it "includes Help sections" do
-        result.select { |h| h['label'] =~ /^help:/ }.length.should == 9
+        search_autocomplete_opts("hel").size.should == 9
       end
 
       it "includes default sections" do
-        result.count { |h| h['label'] =~ /^(My|Admin)\s/ }.should == 4
+        search_autocomplete_opts("adm").size.should == 1
       end
 
       it "includes the user's groups" do
         create(:group).add_owner(user)
-        result.count { |h| h['label'] =~ /^group:/ }.should == 1
+        search_autocomplete_opts("gro").size.should == 1
       end
 
       it "includes the user's projects" do
-        create(:project, namespace: create(:namespace, owner: user))
-        result.count { |h| h['label'] =~ /^project:/ }.should == 1
+        project = create(:project, namespace: create(:namespace, owner: user))
+        search_autocomplete_opts(project.name).size.should == 1
       end
 
       context "with a current project" do
         before { @project = create(:project_with_code) }
 
         it "includes project-specific sections" do
-          result.count { |h| h['label'] =~ /^#{@project.name_with_namespace} - / }.should == 11
-        end
-
-        it "uses @ref in urls if defined" do
-          @ref = "foo_bar"
-          result.count { |h| h['url'] == project_tree_path(@project, @ref) }.should == 1
-        end
-      end
-
-      context "with no current project" do
-        it "does not include project-specific sections" do
-          result.count { |h| h['label'] =~ /Files$/ }.should == 0
+          search_autocomplete_opts("Files").size.should == 1
+          search_autocomplete_opts("Commits").size.should == 1
         end
       end
     end
-- 
cgit v1.2.1