diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/requests/projects/noteable_notes_spec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/requests/projects/noteable_notes_spec.rb')
-rw-r--r-- | spec/requests/projects/noteable_notes_spec.rb | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/spec/requests/projects/noteable_notes_spec.rb b/spec/requests/projects/noteable_notes_spec.rb new file mode 100644 index 00000000000..2bf1ffb2edc --- /dev/null +++ b/spec/requests/projects/noteable_notes_spec.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Project noteable notes' do + describe '#index' do + let_it_be(:merge_request) { create(:merge_request) } + + let(:etag_store) { Gitlab::EtagCaching::Store.new } + let(:notes_path) { project_noteable_notes_path(project, target_type: merge_request.class.name.underscore, target_id: merge_request.id) } + let(:project) { merge_request.project } + let(:user) { project.owner } + + let(:response_etag) { response.headers['ETag'] } + let(:stored_etag) { "W/\"#{etag_store.get(notes_path)}\"" } + + before do + login_as(user) + end + + it 'does not set a Gitlab::EtagCaching ETag if there is a note' do + create(:note_on_merge_request, noteable: merge_request, project: merge_request.project) + + get notes_path + + expect(response).to have_gitlab_http_status(:ok) + + # Rack::ETag will set an etag based on the body digest, but that doesn't + # interfere with notes pagination + expect(response_etag).not_to eq(stored_etag) + end + + it 'sets a Gitlab::EtagCaching ETag if there is no note' do + get notes_path + + expect(response).to have_gitlab_http_status(:ok) + expect(response_etag).to eq(stored_etag) + end + end +end |