From 8c5eff29de2c6204deeb327594af1a936b2d9f7e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 25 Jun 2018 18:39:23 +0200
Subject: [PATCH 1/2] Fix branch API can_push attribute and add specs

---
 lib/api/branches.rb                |  8 ++++---
 spec/requests/api/branches_spec.rb | 35 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index 13cfba728fa..4b223a391ae 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -45,6 +45,7 @@ module API
         present(
           paginate(::Kaminari.paginate_array(branches)),
           with: Entities::Branch,
+          current_user: current_user,
           project: user_project,
           merged_branch_names: merged_branch_names
         )
@@ -63,7 +64,7 @@ module API
         get do
           branch = find_branch!(params[:branch])
 
-          present branch, with: Entities::Branch, project: user_project
+          present branch, with: Entities::Branch, current_user: current_user, project: user_project
         end
       end
 
@@ -101,7 +102,7 @@ module API
                            end
 
         if protected_branch.valid?
-          present branch, with: Entities::Branch, project: user_project
+          present branch, with: Entities::Branch, current_user: current_user, project: user_project
         else
           render_api_error!(protected_branch.errors.full_messages, 422)
         end
@@ -121,7 +122,7 @@ module API
         protected_branch = user_project.protected_branches.find_by(name: branch.name)
         protected_branch&.destroy
 
-        present branch, with: Entities::Branch, project: user_project
+        present branch, with: Entities::Branch, current_user: current_user, project: user_project
       end
 
       desc 'Create branch' do
@@ -140,6 +141,7 @@ module API
         if result[:status] == :success
           present result[:branch],
                   with: Entities::Branch,
+                  current_user: current_user,
                   project: user_project
         else
           render_api_error!(result[:message], 400)
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index 64f51d9843d..0c417baeb77 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -155,6 +155,12 @@ describe API::Branches do
       end
 
       it_behaves_like 'repository branch'
+
+      it 'returns that the current user cannot push' do
+        get api(route, current_user)
+
+        expect(json_response['can_push']).to eq(false)
+      end
     end
 
     context 'when unauthenticated', 'and project is private' do
@@ -169,6 +175,18 @@ describe API::Branches do
 
       it_behaves_like 'repository branch'
 
+      it 'returns that the current user can push' do
+        get api(route, current_user)
+
+        expect(json_response['can_push']).to eq(true)
+      end
+
+      it 'returns that the current user can push' do
+        get api(route, current_user)
+
+        expect(json_response['can_push']).to eq(true)
+      end
+
       context 'when branch contains a dot' do
         let(:branch_name) { branch_with_dot.name }
 
@@ -202,6 +220,23 @@ describe API::Branches do
       end
     end
 
+    context 'when authenticated', 'as a developer and branch is protected' do
+      let(:current_user) { create(:user) }
+      let!(:protected_branch) { create(:protected_branch, project: project, name: branch_name) }
+
+      before do
+        project.add_developer(current_user)
+      end
+
+      it_behaves_like 'repository branch'
+
+      it 'returns that the current user cannot push' do
+        get api(route, current_user)
+
+        expect(json_response['can_push']).to eq(false)
+      end
+    end
+
     context 'when authenticated', 'as a guest' do
       it_behaves_like '403 response' do
         let(:request) { get api(route, guest) }

From 7e9448b747aa0be4ff3ea8446f50486501ded044 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 26 Jun 2018 09:27:32 +0000
Subject: [PATCH 2/2] Remove duplicate spec

---
 spec/requests/api/branches_spec.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index 0c417baeb77..9bb6ed62393 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -181,12 +181,6 @@ describe API::Branches do
         expect(json_response['can_push']).to eq(true)
       end
 
-      it 'returns that the current user can push' do
-        get api(route, current_user)
-
-        expect(json_response['can_push']).to eq(true)
-      end
-
       context 'when branch contains a dot' do
         let(:branch_name) { branch_with_dot.name }