Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 1 deletions

diff --git a/spec/serializers/merge_request_diff_entity_spec.rb b/spec/serializers/merge_request_diff_entity_spec.rb
index 5bc7eea92a8..9bf95e68874 100644
--- a/spec/serializers/merge_request_diff_entity_spec.rb
+++ b/spec/serializers/merge_request_diff_entity_spec.rb
@@ -10,7 +10,9 @@ RSpec.describe MergeRequestDiffEntity do
   let(:merge_request_diffs) { merge_request.merge_request_diffs }
   let(:merge_request_diff) { merge_request_diffs.first }
 
-  let(:entity) do
+  let(:entity) { initialize_entity(merge_request, merge_request_diff) }
+
+  def initialize_entity(merge_request, merge_request_diff)
     described_class.new(
       merge_request_diff,
       request: request,
@@ -70,6 +72,22 @@ RSpec.describe MergeRequestDiffEntity do
 
       it_behaves_like 'version_index is nil'
     end
+
+    context 'when @merge_request_diffs.size > 1' do
+      let(:merge_request) { create(:merge_request_with_multiple_diffs) }
+
+      it 'returns difference between size and diff index' do
+        expect(merge_request_diffs.size).to eq(2)
+
+        # diff index: 0
+        subject = initialize_entity(merge_request, merge_request_diffs.first)
+        expect(subject.as_json[:version_index]).to eq(2)
+
+        # diff index: 1
+        subject = initialize_entity(merge_request, merge_request_diffs.last)
+        expect(subject.as_json[:version_index]).to eq(1)
+      end
+    end
   end
 
   describe '#short_commit_sha' do