summaryrefslogtreecommitdiff
path: root/spec/controllers/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-28 13:14:34 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-29 10:47:03 +0200
commit30c78e70cba395c1336611c58891a75473f8a037 (patch)
treee061fa88d4c325b9ffefa9783236018bfdc85c9d /spec/controllers/ci
parent1530f68c9876bc8376bf4aa199c8abda570f5214 (diff)
downloadgitlab-ce-30c78e70cba395c1336611c58891a75473f8a037.tar.gz
WIP
Diffstat (limited to 'spec/controllers/ci')
-rw-r--r--spec/controllers/ci/commits_controller_spec.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/controllers/ci/commits_controller_spec.rb b/spec/controllers/ci/commits_controller_spec.rb
index b71e7505731..cc39ce7687c 100644
--- a/spec/controllers/ci/commits_controller_spec.rb
+++ b/spec/controllers/ci/commits_controller_spec.rb
@@ -1,14 +1,10 @@
require "spec_helper"
describe Ci::CommitsController do
- before do
- @project = FactoryGirl.create :ci_project
- end
-
describe "GET /status" do
it "returns status of commit" do
- commit = FactoryGirl.create :ci_commit, project: @project
- get :status, id: commit.sha, ref_id: commit.ref, project_id: @project.id
+ commit = FactoryGirl.create :ci_commit
+ get :status, id: commit.sha, ref_id: commit.ref, project_id: commit.project.id
expect(response).to be_success
expect(response.code).to eq('200')
@@ -16,8 +12,8 @@ describe Ci::CommitsController do
end
it "returns not_found status" do
- commit = FactoryGirl.create :ci_commit, project: @project
- get :status, id: commit.sha, ref_id: "deploy", project_id: @project.id
+ commit = FactoryGirl.create :ci_commit
+ get :status, id: commit.sha, ref_id: "deploy", project_id: commit.project.id
expect(response).to be_success
expect(response.code).to eq('200')