6 files changed, 54 insertions, 36 deletions
diff --git a/spec/frontend/fixtures/freeze_period.rb b/spec/frontend/fixtures/freeze_period.rb
index 7695dbc2e8f..193bd0c3ef2 100644
--- a/spec/frontend/fixtures/freeze_period.rb
+++ b/spec/frontend/fixtures/freeze_period.rb
@@ -17,6 +17,15 @@ RSpec.describe 'Freeze Periods (JavaScript fixtures)' do
     remove_repository(project)
   end
 
+  around do |example|
+    freeze_time do
+      # Mock time to sept 19 (intl. talk like a pirate day)
+      Timecop.travel(2020, 9, 19)
+
+      example.run
+    end
+  end
+
   describe API::FreezePeriods, '(JavaScript fixtures)', type: :request do
     include ApiHelpers
 
diff --git a/spec/frontend/fixtures/groups.rb b/spec/frontend/fixtures/groups.rb
index 6f0d7aa1f7c..9f0b2c73c93 100644
--- a/spec/frontend/fixtures/groups.rb
+++ b/spec/frontend/fixtures/groups.rb
@@ -15,7 +15,6 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
   end
 
   before do
-    stub_feature_flags(new_variables_ui: false)
     group.add_maintainer(admin)
     sign_in(admin)
   end
@@ -27,12 +26,4 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
       expect(response).to be_successful
     end
   end
-
-  describe Groups::Settings::CiCdController, '(JavaScript fixtures)', type: :controller do
-    it 'groups/ci_cd_settings.html' do
-      get :show, params: { group_id: group }
-
-      expect(response).to be_successful
-    end
-  end
 end
diff --git a/spec/frontend/fixtures/issues.rb b/spec/frontend/fixtures/issues.rb
index 2c380ba6a96..baea87be45f 100644
--- a/spec/frontend/fixtures/issues.rb
+++ b/spec/frontend/fixtures/issues.rb
@@ -16,6 +16,8 @@ RSpec.describe Projects::IssuesController, '(JavaScript fixtures)', type: :contr
   end
 
   before do
+    stub_feature_flags(vue_issue_header: false)
+
     sign_in(admin)
   end
 
diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb
index d33909fb98b..d0cedb0ef86 100644
--- a/spec/frontend/fixtures/projects.rb
+++ b/spec/frontend/fixtures/projects.rb
@@ -20,7 +20,6 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
   end
 
   before do
-    stub_feature_flags(new_variables_ui: false)
     project.add_maintainer(admin)
     sign_in(admin)
     allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')
@@ -58,27 +57,4 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
       expect(response).to be_successful
     end
   end
-
-  describe Projects::Settings::CiCdController, '(JavaScript fixtures)', type: :controller do
-    it 'projects/ci_cd_settings.html' do
-      get :show, params: {
-        namespace_id: project.namespace.to_param,
-        project_id: project
-      }
-
-      expect(response).to be_successful
-    end
-
-    it 'projects/ci_cd_settings_with_variables.html' do
-      create(:ci_variable, project: project_variable_populated)
-      create(:ci_variable, project: project_variable_populated)
-
-      get :show, params: {
-        namespace_id: project_variable_populated.namespace.to_param,
-        project_id: project_variable_populated
-      }
-
-      expect(response).to be_successful
-    end
-  end
 end
diff --git a/spec/frontend/fixtures/search.rb b/spec/frontend/fixtures/search.rb
index 40f613a9422..7819d0774a7 100644
--- a/spec/frontend/fixtures/search.rb
+++ b/spec/frontend/fixtures/search.rb
@@ -26,8 +26,51 @@ RSpec.describe SearchController, '(JavaScript fixtures)', type: :controller do
   context 'search within a project' do
     let(:namespace) { create(:namespace, name: 'frontend-fixtures') }
     let(:project) { create(:project, :public, :repository, namespace: namespace, path: 'search-project') }
+    let(:blobs) do
+      Kaminari.paginate_array([
+        Gitlab::Search::FoundBlob.new(
+          path: 'CHANGELOG',
+          basename: 'CHANGELOG',
+          ref: 'master',
+          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'CONTRIBUTING',
+          basename: 'CONTRIBUTING',
+          ref: 'master',
+          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'README',
+          basename: 'README',
+          ref: 'master',
+          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'test',
+          basename: 'test',
+          ref: 'master',
+          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2)
+     ],
+     total_count: 4,
+     limit: 4,
+     offset: 0)
+    end
 
     it 'search/blob_search_result.html' do
+      expect_next_instance_of(SearchService) do |search_service|
+        expect(search_service).to receive(:search_objects).and_return(blobs)
+      end
+
       get :show, params: {
         search: 'Send',
         project_id: project.id,
diff --git a/spec/frontend/fixtures/static/signin_tabs.html b/spec/frontend/fixtures/static/signin_tabs.html
index 247a6b03054..7e66ab9394b 100644
--- a/spec/frontend/fixtures/static/signin_tabs.html
+++ b/spec/frontend/fixtures/static/signin_tabs.html
@@ -5,7 +5,4 @@
 <li>
 <a href="#login-pane">Standard</a>
 </li>
-<li>
-<a href="#register-pane">Register</a>
-</li>
 </ul>