diff options
Diffstat (limited to 'spec/services/files/multi_service_spec.rb')
-rw-r--r-- | spec/services/files/multi_service_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/services/files/multi_service_spec.rb b/spec/services/files/multi_service_spec.rb index 9b85d83e721..7149fa77d6a 100644 --- a/spec/services/files/multi_service_spec.rb +++ b/spec/services/files/multi_service_spec.rb @@ -19,6 +19,10 @@ RSpec.describe Files::MultiService, feature_category: :source_code_management 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, feature_category: :source_code_management 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 |