1 files changed, 15 insertions, 1 deletions
diff --git a/spec/services/files/multi_service_spec.rb b/spec/services/files/multi_service_spec.rb
index 6a5c7d2749d..7149fa77d6a 100644
--- a/spec/services/files/multi_service_spec.rb
+++ b/spec/services/files/multi_service_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Files::MultiService do
+RSpec.describe Files::MultiService, feature_category: :source_code_management do
   subject { described_class.new(project, user, commit_params) }
 
   let(:project) { create(:project, :repository) }
@@ -19,6 +19,10 @@ RSpec.describe Files::MultiService do
     Gitlab::Git::Commit.last_for_path(project.repository, branch_name, original_file_path).sha
   end
 
+  let(:branch_commit_id) do
+    Gitlab::Git::Commit.find(project.repository, branch_name).sha
+  end
+
   let(:default_action) do
     {
       action: action,
@@ -78,6 +82,16 @@ RSpec.describe Files::MultiService do
         end
       end
 
+      context 'when file not changed, but later commit id is used' do
+        let(:actions) { [default_action.merge(last_commit_id: branch_commit_id)] }
+
+        it 'accepts the commit' do
+          results = subject.execute
+
+          expect(results[:status]).to eq(:success)
+        end
+      end
+
       context 'when the file have not been modified' do
         it 'accepts the commit' do
           results = subject.execute