moving labels specs to projects_spec file

2 files changed, 13 insertions, 26 deletions

diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
deleted file mode 100644
index ba5efb6c603..00000000000
--- a/spec/requests/api/labels_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe API::API do
-  include ApiHelpers
-  before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
-  after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
-
-  let(:user) { create(:user) }
-  let!(:project) { create(:project, namespace: user.namespace ) }
-  let!(:issue) { create(:issue, author: user, assignee: user, project: project, :label_list => "label1, label2") }
-  before { project.team << [user, :reporter] }
-
-
-  describe "GET /projects/:id/labels" do
-    it "should return project labels" do
-      get api("/projects/#{project.id}/labels", user)
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.first['name'].should == 'label1'
-      json_response.last['name'].should == 'label2'
-    end
-  end
-
-
-end
-
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 149c5bffcda..7fe65639657 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -13,6 +13,7 @@ describe API::API do
   let(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
   let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
   let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
+  let(:issue_with_labels) { create(:issue, author: user, assignee: user, project: project, :label_list => "label1, label2") }
 
   describe "GET /projects" do
     before { project }
@@ -632,4 +633,16 @@ describe API::API do
       end
     end
   end
+
+   describe "GET /projects/:id/labels" do
+    before { issue_with_labels }
+
+    it "should return project labels" do
+      get api("/projects/#{project.id}/labels", user)
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.first['name'].should == issue_with_labels.labels.first.name
+      json_response.last['name'].should == issue_with_labels.labels.last.name
+    end
+  end
 end