Add latest changes from gitlab-org/gitlab@master

4 files changed, 33 insertions, 11 deletions

diff --git a/spec/requests/api/graphql/mutations/commits/create_spec.rb b/spec/requests/api/graphql/mutations/commits/create_spec.rb
index ac4fa7cfe83..375d4f10b40 100644
--- a/spec/requests/api/graphql/mutations/commits/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/commits/create_spec.rb
@@ -23,6 +23,18 @@ RSpec.describe 'Creation of a new commit' do
   let(:mutation) { graphql_mutation(:commit_create, input) }
   let(:mutation_response) { graphql_mutation_response(:commit_create) }
 
+  shared_examples 'a commit is successful' do
+    it 'creates a new commit' do
+      post_graphql_mutation(mutation, current_user: current_user)
+
+      expect(response).to have_gitlab_http_status(:success)
+
+      expect(mutation_response['commit']).to include(
+        'title' => message
+      )
+    end
+  end
+
   context 'the user is not allowed to create a commit' do
     it_behaves_like 'a mutation that returns a top-level access error'
   end
@@ -32,14 +44,7 @@ RSpec.describe 'Creation of a new commit' do
       project.add_developer(current_user)
     end
 
-    it 'creates a new commit' do
-      post_graphql_mutation(mutation, current_user: current_user)
-
-      expect(response).to have_gitlab_http_status(:success)
-      expect(mutation_response['commit']).to include(
-        'title' => message
-      )
-    end
+    it_behaves_like 'a commit is successful'
 
     context 'when branch is not correct' do
       let(:branch) { 'unknown' }
@@ -47,5 +52,22 @@ RSpec.describe 'Creation of a new commit' do
       it_behaves_like 'a mutation that returns errors in the response',
         errors: ['You can only create or edit files when you are on a branch']
     end
+
+    context 'when branch is new, and a start_branch is defined' do
+      let(:input) { { project_path: project.full_path, branch: branch, start_branch: start_branch, message: message, actions: actions } }
+      let(:branch) { 'new-branch' }
+      let(:start_branch) { 'master' }
+      let(:actions) do
+        [
+          {
+            action: 'CREATE',
+            filePath: 'ANOTHER_FILE.md',
+            content: 'Bye'
+          }
+        ]
+      end
+
+      it_behaves_like 'a commit is successful'
+    end
   end
 end
diff --git a/spec/requests/api/graphql/mutations/releases/create_spec.rb b/spec/requests/api/graphql/mutations/releases/create_spec.rb
index 2402cf62a49..d745eb3083d 100644
--- a/spec/requests/api/graphql/mutations/releases/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/releases/create_spec.rb
@@ -121,7 +121,7 @@ RSpec.describe 'Creation of a new release' do
         create_release
 
         release = mutation_response[:release]
-        expected_direct_asset_url = Gitlab::Routing.url_helpers.project_release_url(project, Release.find_by(tag: tag_name)) << asset_link[:directAssetPath]
+        expected_direct_asset_url = Gitlab::Routing.url_helpers.project_release_url(project, Release.find_by(tag: tag_name)) << "/downloads#{asset_link[:directAssetPath]}"
 
         expected_attributes = {
           tagName: tag_name,
diff --git a/spec/requests/api/graphql/project/release_spec.rb b/spec/requests/api/graphql/project/release_spec.rb
index 57b620dbdf7..57dbe258ce4 100644
--- a/spec/requests/api/graphql/project/release_spec.rb
+++ b/spec/requests/api/graphql/project/release_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe 'Query.project(fullPath).release(tagName)' do
               'name' => link.name,
               'url' => link.url,
               'external' => link.external?,
-              'directAssetUrl' => link.filepath ? Gitlab::Routing.url_helpers.project_release_url(project, release) << link.filepath : link.url
+              'directAssetUrl' => link.filepath ? Gitlab::Routing.url_helpers.project_release_url(project, release) << "/downloads#{link.filepath}" : link.url
             }
           end
 
diff --git a/spec/requests/api/release/links_spec.rb b/spec/requests/api/release/links_spec.rb
index 82d0d64eba4..c03dd0331cf 100644
--- a/spec/requests/api/release/links_spec.rb
+++ b/spec/requests/api/release/links_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe API::Release::Links do
         specify do
           get api("/projects/#{project.id}/releases/v0.1/assets/links/#{link.id}", maintainer)
 
-          expect(json_response['direct_asset_url']).to eq("http://localhost/#{project.namespace.path}/#{project.name}/-/releases/#{release.tag}/bin/bigfile.exe")
+          expect(json_response['direct_asset_url']).to eq("http://localhost/#{project.namespace.path}/#{project.name}/-/releases/#{release.tag}/downloads/bin/bigfile.exe")
         end
       end