Move EE-only elasticsearch specs in spec/requests/api/search_spec.rb

ee/spec/requests/api/search_spec.rb

+require 'spec_helper'
+
+describe API::Search do
+  set(:user) { create(:user) }
+  set(:group) { create(:group) }
+  let(:project) { create(:project, :public, name: 'awesome project', group: group) }
+  let(:repo_project) { create(:project, :public, :repository, group: group) }
+
+  shared_examples 'response is correct' do |schema:, size: 1|
+    it { expect(response).to have_gitlab_http_status(200) }
+    it { expect(response).to match_response_schema(schema) }
+    it { expect(response).to include_limited_pagination_headers }
+    it { expect(json_response.size).to eq(size) }
+  end
+
+  shared_examples 'elasticsearch disabled' do
+    it 'returns 400 error for wiki_blobs scope' do
+      get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+
+    it 'returns 400 error for blobs scope' do
+      get api(endpoint, user), scope: 'blobs', search: 'monitors'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+
+    it 'returns 400 error for commits scope' do
+      get api(endpoint, user), scope: 'commits', search: 'folder'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+  end
+
+  shared_examples 'elasticsearch enabled' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      Gitlab::Elastic::Helper.create_empty_index
+    end
+
+    after do
+      Gitlab::Elastic::Helper.delete_index
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    end
+
+    context 'for wiki_blobs scope' do
+      before do
+        wiki = create(:project_wiki, project: project)
+        create(:wiki_page, wiki: wiki, attrs: { title: 'home', content: "Awesome page" })
+
+        project.wiki.index_blobs
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
+    end
+
+    context 'for commits scope' do
+      before do
+        repo_project.repository.index_commits
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'commits', search: 'folder'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details', size: 2
+    end
+
+    context 'for blobs scope' do
+      before do
+        repo_project.repository.index_blobs
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'blobs', search: 'monitors'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
+    end
+  end
+
+  describe 'GET /search' do
+    context 'with correct params' do
+      context 'when elasticsearch is disabled' do
+        it_behaves_like 'elasticsearch disabled' do
+          let(:endpoint) { '/search' }
+        end
+      end
+
+      context 'when elasticsearch is enabled' do
+        it_behaves_like 'elasticsearch enabled' do
+          let(:endpoint) { '/search' }
+        end
+      end
+    end
+  end
+
+  describe "GET /groups/:id/-/search" do
+    context 'with correct params' do
+      context 'when elasticsearch is disabled' do
+        it_behaves_like 'elasticsearch disabled' do
+          let(:endpoint) { "/groups/#{group.id}/-/search" }
+        end
+      end
+
+      context 'when elasticsearch is enabled' do
+        it_behaves_like 'elasticsearch enabled' do
+          let(:endpoint) { "/groups/#{group.id}/-/search" }
+        end
+      end
+    end
+  end
+end

spec/requests/api/search_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe API::Search do
   set(:user) { create(:user) }
   set(:group) { create(:group) }
-  let(:project) { create(:project, :public, name: 'awesome project', group: group) }
-  let(:repo_project) { create(:project, :public, :repository, group: group) }
+  set(:project) { create(:project, :public, name: 'awesome project', group: group) }
+  set(:repo_project) { create(:project, :public, :repository, group: group) }
 
   shared_examples 'response is correct' do |schema:, size: 1|
     it { expect(response).to have_gitlab_http_status(200) }
@@ -13,74 +13,6 @@ describe API::Search do
     it { expect(json_response.size).to eq(size) }
   end
 
-  shared_examples 'elasticsearch disabled' do
-    it 'returns 400 error for wiki_blobs scope' do
-      get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-
-    it 'returns 400 error for blobs scope' do
-      get api(endpoint, user), scope: 'blobs', search: 'monitors'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-
-    it 'returns 400 error for commits scope' do
-      get api(endpoint, user), scope: 'commits', search: 'folder'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-  end
-
-  shared_examples 'elasticsearch enabled' do
-    before do
-      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-      Gitlab::Elastic::Helper.create_empty_index
-    end
-
-    after do
-      Gitlab::Elastic::Helper.delete_index
-      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-    end
-
-    context 'for wiki_blobs scope' do
-      before do
-        wiki = create(:project_wiki, project: project)
-        create(:wiki_page, wiki: wiki, attrs: { title: 'home', content: "Awesome page" })
-
-        project.wiki.index_blobs
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
-    end
-
-    context 'for commits scope' do
-      before do
-        repo_project.repository.index_commits
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'commits', search: 'folder'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details', size: 2
-    end
-
-    context 'for blobs scope' do
-      before do
-        repo_project.repository.index_blobs
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'blobs', search: 'monitors'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
-    end
-  end
-
   describe 'GET /search'  do
     context 'when user is not authenticated' do
       it 'returns 401 error' do
@@ -109,8 +41,6 @@ describe API::Search do
     context 'with correct params' do
       context 'for projects scope' do
         before do
-          project
-
           get api('/search', user), scope: 'projects', search: 'awesome'
         end
 
@@ -166,18 +96,6 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/snippets'
       end
-
-      context 'when elasticsearch is disabled' do
-        it_behaves_like 'elasticsearch disabled' do
-          let(:endpoint) { '/search' }
-        end
-      end
-
-      context 'when elasticsearch is enabled' do
-        it_behaves_like 'elasticsearch enabled' do
-          let(:endpoint) { '/search' }
-        end
-      end
     end
   end
 
@@ -227,8 +145,6 @@ describe API::Search do
     context 'with correct params' do
       context 'for projects scope' do
         before do
-          project
-
           get api("/groups/#{group.id}/-/search", user), scope: 'projects', search: 'awesome'
         end
 
@@ -276,18 +192,6 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
       end
-
-      context 'when elasticsearch is disabled' do
-        it_behaves_like 'elasticsearch disabled' do
-          let(:endpoint) { "/groups/#{group.id}/-/search" }
-        end
-      end
-
-      context 'when elasticsearch is enabled' do
-        it_behaves_like 'elasticsearch enabled' do
-          let(:endpoint) { "/groups/#{group.id}/-/search" }
-        end
-      end
     end
   end