From ade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 2 Apr 2020 09:08:14 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/serializers/diff_file_entity_spec.rb | 8 +++++--- spec/serializers/diffs_entity_spec.rb | 2 +- spec/serializers/diffs_metadata_entity_spec.rb | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'spec/serializers') diff --git a/spec/serializers/diff_file_entity_spec.rb b/spec/serializers/diff_file_entity_spec.rb index 3e341a58a15..e3ecd72b275 100644 --- a/spec/serializers/diff_file_entity_spec.rb +++ b/spec/serializers/diff_file_entity_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe DiffFileEntity do include RepoHelpers - let(:project) { create(:project, :repository) } + let_it_be(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:commit) { project.commit(sample_commit.id) } let(:diff_refs) { commit.diff_refs } @@ -21,10 +21,11 @@ describe DiffFileEntity do end context 'when there is a merge request' do + let_it_be(:merge_request) { create(:merge_request, source_project: project, target_project: project) } let(:user) { create(:user) } + let(:code_navigation_path) { Gitlab::CodeNavigationPath.new(project, project.commit.sha) } let(:request) { EntityRequest.new(project: project, current_user: user) } - let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } - let(:entity) { described_class.new(diff_file, options.merge(request: request, merge_request: merge_request)) } + let(:entity) { described_class.new(diff_file, options.merge(request: request, merge_request: merge_request, code_navigation_path: code_navigation_path)) } let(:exposed_urls) { %i(edit_path view_path context_lines_path) } it_behaves_like 'diff file entity' @@ -32,6 +33,7 @@ describe DiffFileEntity do it 'exposes additional attributes' do expect(subject).to include(*exposed_urls) expect(subject).to include(:replaced_view_path) + expect(subject).to include(:code_navigation_path) end it 'points all urls to merge request target project' do diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb index 59acbdac3d0..bb4ac5f9608 100644 --- a/spec/serializers/diffs_entity_spec.rb +++ b/spec/serializers/diffs_entity_spec.rb @@ -23,7 +23,7 @@ describe DiffsEntity do :start_version, :latest_diff, :latest_version_path, :added_lines, :removed_lines, :render_overflow_warning, :email_patch_path, :plain_diff_path, :diff_files, - :merge_request_diffs + :merge_request_diffs, :definition_path_prefix ) end end diff --git a/spec/serializers/diffs_metadata_entity_spec.rb b/spec/serializers/diffs_metadata_entity_spec.rb index 86438bd59d7..a6bf9a7700e 100644 --- a/spec/serializers/diffs_metadata_entity_spec.rb +++ b/spec/serializers/diffs_metadata_entity_spec.rb @@ -28,8 +28,8 @@ describe DiffsMetadataEntity do :start_version, :latest_diff, :latest_version_path, :added_lines, :removed_lines, :render_overflow_warning, :email_patch_path, :plain_diff_path, - :merge_request_diffs, - :context_commits, + :merge_request_diffs, :context_commits, + :definition_path_prefix, # Attributes :diff_files ) -- cgit v1.2.3