Commit 41d01281 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'

Extract EE specific files/lines for spec/lib/gitlab/ci

See merge request gitlab-org/gitlab-ce!19971
parents 0f18d489 6a684432
...@@ -49,7 +49,7 @@ describe Gitlab::Ci::Config do ...@@ -49,7 +49,7 @@ describe Gitlab::Ci::Config do
describe '.new' do describe '.new' do
it 'raises error' do it 'raises error' do
expect { config }.to raise_error( expect { config }.to raise_error(
Gitlab::Ci::Config::Loader::FormatError, ::Gitlab::Ci::Config::Loader::FormatError,
/Invalid configuration format/ /Invalid configuration format/
) )
end end
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::Ci::Pipeline::Chain::Populate do describe Gitlab::Ci::Pipeline::Chain::Populate do
set(:project) { create(:project) } set(:project) { create(:project, :repository) }
set(:user) { create(:user) } set(:user) { create(:user) }
let(:pipeline) do let(:pipeline) do
...@@ -174,7 +174,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do ...@@ -174,7 +174,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
end end
let(:pipeline) do let(:pipeline) do
build(:ci_pipeline, ref: 'master', config: config) build(:ci_pipeline, ref: 'master', project: project, config: config)
end end
it_behaves_like 'a correct pipeline' it_behaves_like 'a correct pipeline'
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::Ci::Pipeline::Chain::Validate::Config do describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
set(:project) { create(:project) } set(:project) { create(:project, :repository) }
set(:user) { create(:user) } set(:user) { create(:user) }
let(:command) do let(:command) do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
module Gitlab module Gitlab
module Ci module Ci
describe YamlProcessor, :lib do describe YamlProcessor do
subject { described_class.new(config) } subject { described_class.new(config) }
describe 'our current .gitlab-ci.yml' do describe 'our current .gitlab-ci.yml' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment