API: commits belong to project repository

2 files changed, 21 insertions, 29 deletions

diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
deleted file mode 100644
index 3af5ec21c43..00000000000
--- a/spec/requests/api/commits_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::API do
-  include ApiHelpers
-
-  let(:user) { Factory :user }
-  let!(:project) { Factory :project, owner: user }
-
-  describe "GET /projects/:id/commits" do
-    context "authorized user" do
-      before { project.add_access(user, :read) }
-
-      it "should return project commits" do
-        get api("/projects/#{project.code}/commits", user)
-        response.status.should == 200
-
-        json_response.should be_an Array
-        json_response.first['id'].should == project.commit.id
-      end
-    end
-
-    context "unauthorized user" do
-      it "should return project commits" do
-        get api("/projects/#{project.code}/commits")
-        response.status.should == 401
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 40a9147d726..498bbad6179 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -199,6 +199,27 @@ describe Gitlab::API do
     end
   end
 
+  describe "GET /projects/:id/repository/commits" do
+    context "authorized user" do
+      before { project.add_access(user2, :read) }
+
+      it "should return project commits" do
+        get api("/projects/#{project.code}/repository/commits", user)
+        response.status.should == 200
+
+        json_response.should be_an Array
+        json_response.first['id'].should == project.commit.id
+      end
+    end
+
+    context "unauthorized user" do
+      it "should not return project commits" do
+        get api("/projects/#{project.code}/repository/commits")
+        response.status.should == 401
+      end
+    end
+  end
+
   describe "GET /projects/:id/snippets/:snippet_id" do
     it "should return a project snippet" do
       get api("/projects/#{project.code}/snippets/#{snippet.id}", user)