diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /spec/models/generic_commit_status_spec.rb | |
parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'spec/models/generic_commit_status_spec.rb')
-rw-r--r-- | spec/models/generic_commit_status_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb index d0e02618b6b..c4e781dd1dc 100644 --- a/spec/models/generic_commit_status_spec.rb +++ b/spec/models/generic_commit_status_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' describe GenericCommitStatus, models: true do - let(:commit) { FactoryGirl.create :ci_commit } - let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, commit: commit } + let(:pipeline) { FactoryGirl.create :ci_pipeline } + let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, pipeline: pipeline } describe :context do subject { generic_commit_status.context } |