Fix specs related to emtpy except policy config

This commit is contained in:
Grzegorz Bizon 2019-01-14 14:50:12 +01:00
parent 0ea8c236c1
commit 0cba9bef8a
3 changed files with 5 additions and 10 deletions

View file

@ -160,8 +160,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables: { 'VAR' => 'value' },
ignore: false,
after_script: ['make clean'],
only: { refs: %w[branches tags] },
except: {} },
only: { refs: %w[branches tags] } },
spinach: { name: :spinach,
before_script: [],
script: %w[spinach],
@ -172,8 +171,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables: {},
ignore: false,
after_script: ['make clean'],
only: { refs: %w[branches tags] },
except: {} }
only: { refs: %w[branches tags] } }
)
end
end

View file

@ -258,8 +258,7 @@ describe Gitlab::Ci::Config::Entry::Job do
stage: 'test',
ignore: false,
after_script: %w[cleanup],
only: { refs: %w[branches tags] },
except: {})
only: { refs: %w[branches tags] })
end
end
end

View file

@ -67,14 +67,12 @@ describe Gitlab::Ci::Config::Entry::Jobs do
script: %w[rspec],
ignore: false,
stage: 'test',
only: { refs: %w[branches tags] },
except: {} },
only: { refs: %w[branches tags] } },
spinach: { name: :spinach,
script: %w[spinach],
ignore: false,
stage: 'test',
only: { refs: %w[branches tags] },
except: {} })
only: { refs: %w[branches tags] } })
end
end