diff options
| author | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
|---|---|---|
| committer | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
| commit | 3e28cca5744410a82131bf02e17d785c7223d44b (patch) | |
| tree | 2a5713659df1ed0c6865714032af9ac2c8f73b2a /spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | |
| parent | acdc0d73274b80fb104eea73e86eb4b9f92c848d (diff) | |
| parent | abc6be62a06349f395da0b33e814512ef15c06fb (diff) | |
Resolve conflicts with latest workflow label changes
Diffstat (limited to 'spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb index c5a4d9b4778..284aed91e29 100644 --- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb +++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Gitlab::Ci::Pipeline::Chain::Populate do - set(:project) { create(:project) } + set(:project) { create(:project, :repository) } set(:user) { create(:user) } let(:pipeline) do @@ -174,7 +174,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do end let(:pipeline) do - build(:ci_pipeline, ref: 'master', config: config) + build(:ci_pipeline, ref: 'master', project: project, config: config) end it_behaves_like 'a correct pipeline' |