Commit 0cba9bef authored by Grzegorz Bizon's avatar Grzegorz Bizon

Fix specs related to emtpy `except` policy config

parent 0ea8c236
...@@ -160,8 +160,7 @@ describe Gitlab::Ci::Config::Entry::Global do ...@@ -160,8 +160,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables: { 'VAR' => 'value' }, variables: { 'VAR' => 'value' },
ignore: false, ignore: false,
after_script: ['make clean'], after_script: ['make clean'],
only: { refs: %w[branches tags] }, only: { refs: %w[branches tags] } },
except: {} },
spinach: { name: :spinach, spinach: { name: :spinach,
before_script: [], before_script: [],
script: %w[spinach], script: %w[spinach],
...@@ -172,8 +171,7 @@ describe Gitlab::Ci::Config::Entry::Global do ...@@ -172,8 +171,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables: {}, variables: {},
ignore: false, ignore: false,
after_script: ['make clean'], after_script: ['make clean'],
only: { refs: %w[branches tags] }, only: { refs: %w[branches tags] } }
except: {} }
) )
end end
end end
......
...@@ -258,8 +258,7 @@ describe Gitlab::Ci::Config::Entry::Job do ...@@ -258,8 +258,7 @@ describe Gitlab::Ci::Config::Entry::Job do
stage: 'test', stage: 'test',
ignore: false, ignore: false,
after_script: %w[cleanup], after_script: %w[cleanup],
only: { refs: %w[branches tags] }, only: { refs: %w[branches tags] })
except: {})
end end
end end
end end
......
...@@ -67,14 +67,12 @@ describe Gitlab::Ci::Config::Entry::Jobs do ...@@ -67,14 +67,12 @@ describe Gitlab::Ci::Config::Entry::Jobs do
script: %w[rspec], script: %w[rspec],
ignore: false, ignore: false,
stage: 'test', stage: 'test',
only: { refs: %w[branches tags] }, only: { refs: %w[branches tags] } },
except: {} },
spinach: { name: :spinach, spinach: { name: :spinach,
script: %w[spinach], script: %w[spinach],
ignore: false, ignore: false,
stage: 'test', stage: 'test',
only: { refs: %w[branches tags] }, only: { refs: %w[branches tags] } })
except: {} })
end end
end end
......
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