Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 51 insertions, 0 deletions

diff --git a/spec/lib/gitlab/diff/file_collection_sorter_spec.rb b/spec/lib/gitlab/diff/file_collection_sorter_spec.rb
new file mode 100644
index 00000000000..8822fc55c6e
--- /dev/null
+++ b/spec/lib/gitlab/diff/file_collection_sorter_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Diff::FileCollectionSorter do
+  let(:diffs) do
+    [
+      double(new_path: '.dir/test', old_path: '.dir/test'),
+      double(new_path: '', old_path: '.file'),
+      double(new_path: '1-folder/A-file.ext', old_path: '1-folder/A-file.ext'),
+      double(new_path: nil, old_path: '1-folder/M-file.ext'),
+      double(new_path: '1-folder/Z-file.ext', old_path: '1-folder/Z-file.ext'),
+      double(new_path: '', old_path: '1-folder/nested/A-file.ext'),
+      double(new_path: '1-folder/nested/M-file.ext', old_path: '1-folder/nested/M-file.ext'),
+      double(new_path: nil, old_path: '1-folder/nested/Z-file.ext'),
+      double(new_path: '2-folder/A-file.ext', old_path: '2-folder/A-file.ext'),
+      double(new_path: '', old_path: '2-folder/M-file.ext'),
+      double(new_path: '2-folder/Z-file.ext', old_path: '2-folder/Z-file.ext'),
+      double(new_path: nil, old_path: '2-folder/nested/A-file.ext'),
+      double(new_path: 'A-file.ext', old_path: 'A-file.ext'),
+      double(new_path: '', old_path: 'M-file.ext'),
+      double(new_path: 'Z-file.ext', old_path: 'Z-file.ext')
+    ]
+  end
+
+  subject { described_class.new(diffs) }
+
+  describe '#sort' do
+    let(:sorted_files_paths) { subject.sort.map { |file| file.new_path.presence || file.old_path } }
+
+    it 'returns list sorted directory first' do
+      expect(sorted_files_paths).to eq([
+        '.dir/test',
+        '1-folder/nested/A-file.ext',
+        '1-folder/nested/M-file.ext',
+        '1-folder/nested/Z-file.ext',
+        '1-folder/A-file.ext',
+        '1-folder/M-file.ext',
+        '1-folder/Z-file.ext',
+        '2-folder/nested/A-file.ext',
+        '2-folder/A-file.ext',
+        '2-folder/M-file.ext',
+        '2-folder/Z-file.ext',
+        '.file',
+        'A-file.ext',
+        'M-file.ext',
+        'Z-file.ext'
+      ])
+    end
+  end
+end