diff options
Diffstat (limited to 'spec/models/merge_request_diff_spec.rb')
-rw-r--r-- | spec/models/merge_request_diff_spec.rb | 94 |
1 files changed, 6 insertions, 88 deletions
diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb index 5b11a7bf079..4075eb96fc2 100644 --- a/spec/models/merge_request_diff_spec.rb +++ b/spec/models/merge_request_diff_spec.rb @@ -23,7 +23,7 @@ RSpec.describe MergeRequestDiff do expect(subject.valid?).to be false expect(subject.errors.count).to eq 3 - expect(subject.errors).to all(include('is not a valid SHA')) + expect(subject.errors.full_messages).to all(include('is not a valid SHA')) end it 'does not validate uniqueness by default' do @@ -61,7 +61,7 @@ RSpec.describe MergeRequestDiff do let_it_be(:merge_head) do MergeRequests::MergeToRefService - .new(merge_request.project, merge_request.author) + .new(project: merge_request.project, current_user: merge_request.author) .execute(merge_request) merge_request.create_merge_head_diff @@ -485,27 +485,6 @@ RSpec.describe MergeRequestDiff do 'files/whitespace' ]) end - - context 'when sort_diffs feature flag is disabled' do - before do - stub_feature_flags(sort_diffs: false) - end - - it 'does not sort diff files directory first' do - expect(diff_with_commits.diffs_in_batch(1, 10, diff_options: diff_options).diff_file_paths).to eq([ - '.DS_Store', - '.gitattributes', - '.gitignore', - '.gitmodules', - 'CHANGELOG', - 'README', - 'bar/branch-test.txt', - 'custom-highlighting/test.gitlab-custom', - 'encoding/iso8859.txt', - 'files/.DS_Store' - ]) - end - end end end @@ -581,37 +560,6 @@ RSpec.describe MergeRequestDiff do 'gitlab-shell' ]) end - - context 'when sort_diffs feature flag is disabled' do - before do - stub_feature_flags(sort_diffs: false) - end - - it 'does not sort diff files directory first' do - expect(diff_with_commits.diffs(diff_options).diff_file_paths).to eq([ - '.DS_Store', - '.gitattributes', - '.gitignore', - '.gitmodules', - 'CHANGELOG', - 'README', - 'bar/branch-test.txt', - 'custom-highlighting/test.gitlab-custom', - 'encoding/iso8859.txt', - 'files/.DS_Store', - 'files/images/wm.svg', - 'files/js/commit.coffee', - 'files/lfs/lfs_object.iso', - 'files/ruby/popen.rb', - 'files/ruby/regex.rb', - 'files/whitespace', - 'foo/bar/.gitkeep', - 'gitlab-grack', - 'gitlab-shell', - 'with space/README.md' - ]) - end - end end end @@ -718,40 +666,6 @@ RSpec.describe MergeRequestDiff do ]) end - context 'when sort_diffs feature flag is disabled' do - before do - stub_feature_flags(sort_diffs: false) - end - - it 'persists diff files unsorted by directory first' do - mr_diff = create(:merge_request).merge_request_diff - diff_files_paths = mr_diff.merge_request_diff_files.map { |file| file.new_path.presence || file.old_path } - - expect(diff_files_paths).to eq([ - '.DS_Store', - '.gitattributes', - '.gitignore', - '.gitmodules', - 'CHANGELOG', - 'README', - 'bar/branch-test.txt', - 'custom-highlighting/test.gitlab-custom', - 'encoding/iso8859.txt', - 'files/.DS_Store', - 'files/images/wm.svg', - 'files/js/commit.coffee', - 'files/lfs/lfs_object.iso', - 'files/ruby/popen.rb', - 'files/ruby/regex.rb', - 'files/whitespace', - 'foo/bar/.gitkeep', - 'gitlab-grack', - 'gitlab-shell', - 'with space/README.md' - ]) - end - end - it 'expands collapsed diffs before saving' do mr_diff = create(:merge_request, source_branch: 'expand-collapse-lines', target_branch: 'master').merge_request_diff diff_file = mr_diff.merge_request_diff_files.find_by(new_path: 'expand-collapse/file-5.txt') @@ -1166,5 +1080,9 @@ RSpec.describe MergeRequestDiff do it 'loads nothing if the merge request has no diff record' do expect(described_class.latest_diff_for_merge_requests(merge_request_3)).to be_empty end + + it 'loads nothing if nil was passed as merge_request' do + expect(described_class.latest_diff_for_merge_requests(nil)).to be_empty + end end end |