Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 3 deletions

diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index edebaf294c4..c0368ab8f3c 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe Projects::NotesController do
         end
 
         it 'returns an empty page of notes' do
-          expect(Gitlab::EtagCaching::Middleware).to receive(:skip!)
+          expect(Gitlab::EtagCaching::Middleware).not_to receive(:skip!)
 
           request.headers['X-Last-Fetched-At'] = microseconds(Time.zone.now)
 
@@ -169,8 +169,6 @@ RSpec.describe Projects::NotesController do
         end
 
         it 'returns all notes' do
-          expect(Gitlab::EtagCaching::Middleware).to receive(:skip!)
-
           get :index, params: request_params
 
           expect(json_response['notes'].count).to eq((page_1 + page_2 + page_3).size + 1)