Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm

Conflicts:
	lib/api/users.rb

1 files changed, 27 insertions, 9 deletions

diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb
index f5822157ea4..3394a1f863f 100644
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
@@ -13,27 +13,32 @@ describe Projects::CommitController do
   describe "#show" do
     shared_examples "export as" do |format|
       it "should generally work" do
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response).to be_success
       end
 
       it "should generate it" do
-        Commit.any_instance.should_receive(:"to_#{format}")
+        expect_any_instance_of(Commit).to receive(:"to_#{format}")
 
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
       end
 
       it "should render it" do
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response.body).to eq(commit.send(:"to_#{format}"))
       end
 
       it "should not escape Html" do
-        Commit.any_instance.stub(:"to_#{format}").and_return('HTML entities &<>" ')
+        allow_any_instance_of(Commit).to receive(:"to_#{format}").
+          and_return('HTML entities &<>" ')
 
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response.body).to_not include('&amp;')
         expect(response.body).to_not include('&gt;')
@@ -47,7 +52,8 @@ describe Projects::CommitController do
       let(:format) { :diff }
 
       it "should really only be a git diff" do
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response.body).to start_with("diff --git")
       end
@@ -58,16 +64,28 @@ describe Projects::CommitController do
       let(:format) { :patch }
 
       it "should really be a git email patch" do
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response.body).to start_with("From #{commit.id}")
       end
 
       it "should contain a git diff" do
-        get :show, project_id: project.to_param, id: commit.id, format: format
+        get(:show, namespace_id: project.namespace.to_param,
+            project_id: project.to_param, id: commit.id, format: format)
 
         expect(response.body).to match(/^diff --git/)
       end
     end
   end
+
+  describe "#branches" do
+    it "contains branch and tags information" do
+      get(:branches, namespace_id: project.namespace.to_param,
+          project_id: project.to_param, id: commit.id)
+
+      expect(assigns(:branches)).to include("master", "feature_conflict")
+      expect(assigns(:tags)).to include("v1.1.0")
+    end
+  end
 end