From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Aug 2020 18:42:06 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee

---
 spec/requests/api/commits_spec.rb | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'spec/requests/api/commits_spec.rb')

diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 724e3177173..21ff0a94db9 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -329,6 +329,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_c_params) do
         {
           branch: 'master',
@@ -342,6 +343,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_utf8_c_params) do
         {
           branch: 'master',
@@ -621,6 +623,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_d_params) do
         {
           branch: 'markdown',
@@ -664,6 +667,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_m_params) do
         {
           branch: 'feature',
@@ -708,6 +712,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_u_params) do
         {
           branch: 'master',
@@ -819,6 +824,7 @@ RSpec.describe API::Commits do
           ]
         }
       end
+
       let(:valid_mo_params) do
         {
           branch: 'master',
@@ -1462,6 +1468,16 @@ RSpec.describe API::Commits do
           expect(json_response['author_name']).to eq(commit.author_name)
           expect(json_response['committer_name']).to eq(user.name)
         end
+
+        it 'supports dry-run without applying changes' do
+          head = project.commit(branch)
+
+          post api(route, current_user), params: { branch: branch, dry_run: true }
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to eq("dry_run" => "success")
+          expect(project.commit(branch)).to eq(head)
+        end
       end
 
       context 'when repository is disabled' do
@@ -1533,6 +1549,14 @@ RSpec.describe API::Commits do
 
           expect(json_response['error_code']).to eq 'empty'
         end
+
+        it 'includes an additional dry_run error field when enabled' do
+          post api(route, current_user), params: { branch: 'markdown', dry_run: true }
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(json_response['error_code']).to eq 'empty'
+          expect(json_response['dry_run']).to eq 'error'
+        end
       end
 
       context 'when ref contains a dot' do
@@ -1623,6 +1647,16 @@ RSpec.describe API::Commits do
           expect(json_response['committer_name']).to eq(user.name)
           expect(json_response['parent_ids']).to contain_exactly(commit_id)
         end
+
+        it 'supports dry-run without applying changes' do
+          head = project.commit(branch)
+
+          post api(route, current_user), params: { branch: branch, dry_run: true }
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to eq("dry_run" => "success")
+          expect(project.commit(branch)).to eq(head)
+        end
       end
 
       context 'when repository is disabled' do
@@ -1704,6 +1738,18 @@ RSpec.describe API::Commits do
           expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['error_code']).to eq 'empty'
         end
+
+        it 'includes an additional dry_run error field when enabled' do
+          # First one actually reverts
+          post api(route, current_user), params: { branch: 'markdown' }
+
+          # Second one is redundant and should be empty
+          post api(route, current_user), params: { branch: 'markdown', dry_run: true }
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(json_response['error_code']).to eq 'empty'
+          expect(json_response['dry_run']).to eq 'error'
+        end
       end
     end
 
-- 
cgit v1.2.3