fix specs. Stage 2

1 files changed, 13 insertions, 13 deletions

diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index 714e5a5a84f..11dc089e1f5 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -9,8 +9,8 @@ describe Ci::API::API do
   end
 
   describe "GET /runners" do
-    let(:gitlab_url) { GitlabCi.config.gitlab_server.url }
-    let(:private_token) { Network.new.authenticate(access_token: "some_token")["private_token"] }
+    let(:gitlab_url) { GitlabCi.config.gitlab_ci.url }
+    let(:private_token) { create(:user).private_token }
     let(:options) do
       {
         private_token: private_token,
@@ -23,7 +23,7 @@ describe Ci::API::API do
     end
 
     it "should retrieve a list of all runners" do
-      get api("/runners"), options
+      get ci_api("/runners", nil), options
       expect(response.status).to eq(200)
       expect(json_response.count).to eq(5)
       expect(json_response.last).to have_key("id")
@@ -33,41 +33,41 @@ describe Ci::API::API do
 
   describe "POST /runners/register" do
     describe "should create a runner if token provided" do
-      before { post api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN }
+      before { post ci_api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN }
 
       it { expect(response.status).to eq(201) }
     end
 
     describe "should create a runner with description" do
-      before { post api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, description: "server.hostname" }
+      before { post ci_api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, description: "server.hostname" }
 
       it { expect(response.status).to eq(201) }
-      it { expect(Runner.first.description).to eq("server.hostname") }
+      it { expect(Ci::Runner.first.description).to eq("server.hostname") }
     end
 
     describe "should create a runner with tags" do
-      before { post api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, tag_list: "tag1, tag2" }
+      before { post ci_api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, tag_list: "tag1, tag2" }
 
       it { expect(response.status).to eq(201) }
-      it { expect(Runner.first.tag_list.sort).to eq(["tag1", "tag2"]) }
+      it { expect(Ci::Runner.first.tag_list.sort).to eq(["tag1", "tag2"]) }
     end
 
     describe "should create a runner if project token provided" do
       let(:project) { FactoryGirl.create(:ci_project) }
-      before { post api("/runners/register"), token: project.token }
+      before { post ci_api("/runners/register"), token: project.token }
 
       it { expect(response.status).to eq(201) }
       it { expect(project.runners.size).to eq(1) }
     end
 
     it "should return 403 error if token is invalid" do
-      post api("/runners/register"), token: 'invalid'
+      post ci_api("/runners/register"), token: 'invalid'
 
       expect(response.status).to eq(403)
     end
 
     it "should return 400 error if no token" do
-      post api("/runners/register")
+      post ci_api("/runners/register")
 
       expect(response.status).to eq(400)
     end
@@ -75,9 +75,9 @@ describe Ci::API::API do
 
   describe "DELETE /runners/delete" do
     let!(:runner) { FactoryGirl.create(:ci_runner) }
-    before { delete api("/runners/delete"), token: runner.token }
+    before { delete ci_api("/runners/delete"), token: runner.token }
 
     it { expect(response.status).to eq(200) }
-    it { expect(Runner.count).to eq(0) }
+    it { expect(Ci::Runner.count).to eq(0) }
   end
 end