From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 18 Feb 2021 10:34:06 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee

---
 spec/requests/whats_new_controller_spec.rb | 66 +++++++++++-------------------
 1 file changed, 25 insertions(+), 41 deletions(-)

(limited to 'spec/requests/whats_new_controller_spec.rb')

diff --git a/spec/requests/whats_new_controller_spec.rb b/spec/requests/whats_new_controller_spec.rb
index 8005d38dbb0..ba7b5d4c000 100644
--- a/spec/requests/whats_new_controller_spec.rb
+++ b/spec/requests/whats_new_controller_spec.rb
@@ -2,64 +2,48 @@
 
 require 'spec_helper'
 
-RSpec.describe WhatsNewController do
+RSpec.describe WhatsNewController, :clean_gitlab_redis_cache do
+  after do
+    ReleaseHighlight.instance_variable_set(:@file_paths, nil)
+  end
+
   describe 'whats_new_path' do
     let(:item) { double(:item) }
     let(:highlights) { double(:highlight, items: [item], map: [item].map, next_page: 2) }
 
-    context 'with whats_new_drawer feature enabled' do
-      before do
-        stub_feature_flags(whats_new_drawer: true)
-      end
-
-      context 'with no page param' do
-        it 'responds with paginated data and headers' do
-          allow(ReleaseHighlight).to receive(:paginated).with(page: 1).and_return(highlights)
-          allow(Gitlab::WhatsNew::ItemPresenter).to receive(:present).with(item).and_return(item)
+    context 'with no page param' do
+      it 'responds with paginated data and headers' do
+        allow(ReleaseHighlight).to receive(:paginated).with(page: 1).and_return(highlights)
 
-          get whats_new_path, xhr: true
+        get whats_new_path, xhr: true
 
-          expect(response.body).to eq(highlights.items.to_json)
-          expect(response.headers['X-Next-Page']).to eq(2)
-        end
+        expect(response.body).to eq(highlights.items.to_json)
+        expect(response.headers['X-Next-Page']).to eq(2)
       end
+    end
 
-      context 'with page param' do
-        it 'passes the page parameter' do
-          expect(ReleaseHighlight).to receive(:paginated).with(page: 2).and_call_original
-
-          get whats_new_path(page: 2), xhr: true
-        end
-
-        it 'returns a 404 if page param is negative' do
-          get whats_new_path(page: -1), xhr: true
+    context 'with page param' do
+      it 'passes the page parameter' do
+        expect(ReleaseHighlight).to receive(:paginated).with(page: 2).and_call_original
 
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
+        get whats_new_path(page: 2), xhr: true
       end
 
-      context 'with version param' do
-        it 'returns items without pagination headers' do
-          allow(ReleaseHighlight).to receive(:for_version).with(version: '42').and_return(highlights)
-          allow(Gitlab::WhatsNew::ItemPresenter).to receive(:present).with(item).and_return(item)
-
-          get whats_new_path(version: 42), xhr: true
+      it 'returns a 404 if page param is negative' do
+        get whats_new_path(page: -1), xhr: true
 
-          expect(response.body).to eq(highlights.items.to_json)
-          expect(response.headers['X-Next-Page']).to be_nil
-        end
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
-    context 'with whats_new_drawer feature disabled' do
-      before do
-        stub_feature_flags(whats_new_drawer: false)
-      end
+    context 'with version param' do
+      it 'returns items without pagination headers' do
+        allow(ReleaseHighlight).to receive(:for_version).with(version: '42').and_return(highlights)
 
-      it 'returns a 404' do
-        get whats_new_path, xhr: true
+        get whats_new_path(version: 42), xhr: true
 
-        expect(response).to have_gitlab_http_status(:not_found)
+        expect(response.body).to eq(highlights.items.to_json)
+        expect(response.headers['X-Next-Page']).to be_nil
       end
     end
   end
-- 
cgit v1.2.3