diff options
Diffstat (limited to 'spec/requests/projects')
3 files changed, 104 insertions, 1 deletions
diff --git a/spec/requests/projects/environments_controller_spec.rb b/spec/requests/projects/environments_controller_spec.rb new file mode 100644 index 00000000000..5cdf507abef --- /dev/null +++ b/spec/requests/projects/environments_controller_spec.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Projects::EnvironmentsController do + let_it_be(:project) { create(:project, :repository) } + + let(:environment) { create(:environment, name: 'production', project: project) } + + describe 'GET #show' do + subject { get project_environment_path(project, environment) } + + before do + sign_in(project.owner) + end + + include_examples 'avoids N+1 queries on environment detail page' + end + + def environment_params(opts = {}) + opts.reverse_merge(namespace_id: project.namespace, + project_id: project, + id: environment.id) + end + + def create_deployment_with_associations(commit_depth:) + commit = project.commit("HEAD~#{commit_depth}") + create(:user, email: commit.author_email) unless User.find_by(email: commit.author_email) + + deployer = create(:user) + pipeline = create(:ci_pipeline, project: environment.project) + build = create(:ci_build, environment: environment.name, pipeline: pipeline, user: deployer) + create(:deployment, :success, environment: environment, deployable: build, user: deployer, + project: project, sha: commit.sha) + end +end diff --git a/spec/requests/projects/issue_links_controller_spec.rb b/spec/requests/projects/issue_links_controller_spec.rb index 3447ff83ed8..81fd1adb1fd 100644 --- a/spec/requests/projects/issue_links_controller_spec.rb +++ b/spec/requests/projects/issue_links_controller_spec.rb @@ -32,7 +32,10 @@ RSpec.describe Projects::IssueLinksController do get namespace_project_issue_links_path(issue_links_params) expect(json_response.count).to eq(1) - expect(json_response.first).to include('path' => project_work_items_path(issue_b.project, issue_b.id)) + expect(json_response.first).to include( + 'path' => project_work_items_path(issue_b.project, issue_b.id), + 'type' => 'TASK' + ) end end end diff --git a/spec/requests/projects/merge_requests_controller_spec.rb b/spec/requests/projects/merge_requests_controller_spec.rb index 3b1ce569033..6580fc8b80f 100644 --- a/spec/requests/projects/merge_requests_controller_spec.rb +++ b/spec/requests/projects/merge_requests_controller_spec.rb @@ -3,6 +3,70 @@ require 'spec_helper' RSpec.describe Projects::MergeRequestsController do + describe 'GET #discussions' do + let_it_be(:merge_request) { create(:merge_request) } + let_it_be(:project) { merge_request.project } + let_it_be(:user) { merge_request.author } + let_it_be(:discussion) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } + let_it_be(:discussion_reply) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: discussion) } + let_it_be(:state_event) { create(:resource_state_event, merge_request: merge_request) } + let_it_be(:discussion_2) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } + let_it_be(:discussion_3) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) } + + before do + login_as(user) + end + + context 'pagination' do + def get_discussions(**params) + get discussions_project_merge_request_path(project, merge_request, params: params.merge(format: :json)) + end + + it 'returns paginated notes and cursor based on per_page param' do + get_discussions(per_page: 2) + + discussions = Gitlab::Json.parse(response.body) + notes = discussions.flat_map { |d| d['notes'] } + + expect(discussions.count).to eq(2) + expect(notes).to match([ + a_hash_including('id' => discussion.id.to_s), + a_hash_including('id' => discussion_reply.id.to_s), + a_hash_including('type' => 'StateNote') + ]) + + cursor = response.header['X-Next-Page-Cursor'] + expect(cursor).to be_present + + get_discussions(per_page: 1, cursor: cursor) + + discussions = Gitlab::Json.parse(response.body) + notes = discussions.flat_map { |d| d['notes'] } + + expect(discussions.count).to eq(1) + expect(notes).to match([ + a_hash_including('id' => discussion_2.id.to_s) + ]) + end + + context 'when paginated_mr_discussions is disabled' do + before do + stub_feature_flags(paginated_mr_discussions: false) + end + + it 'returns all discussions and ignores per_page param' do + get_discussions(per_page: 2) + + discussions = Gitlab::Json.parse(response.body) + notes = discussions.flat_map { |d| d['notes'] } + + expect(discussions.count).to eq(4) + expect(notes.count).to eq(5) + end + end + end + end + context 'token authentication' do context 'when public project' do let_it_be(:public_project) { create(:project, :public) } |