Commit d6285430 authored by Vitali Tatarintev's avatar Vitali Tatarintev

Merge branch 'ee-spec' into 'master'

Update ruby version in EE specs to 3.0.1

See merge request gitlab-org/gitlab!59229
parents 768ba4ce 15cf919a
...@@ -5,7 +5,7 @@ require 'spec_helper' ...@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec.describe Gitlab::Ci::Config::Required::Processor do RSpec.describe Gitlab::Ci::Config::Required::Processor do
subject { described_class.new(config).perform } subject { described_class.new(config).perform }
let(:config) { { image: 'ruby:2.5.3' } } let(:config) { { image: 'ruby:3.0.1' } }
context 'when feature is available' do context 'when feature is available' do
before do before do
......
...@@ -5,7 +5,7 @@ require 'spec_helper' ...@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do
subject { described_class.new(config, project, ref).perform } subject { described_class.new(config, project, ref).perform }
let_it_be(:config) { { image: 'ruby:2.5.3' } } let_it_be(:config) { { image: 'ruby:3.0.1' } }
let_it_be(:ref) { 'master' } let_it_be(:ref) { 'master' }
let_it_be_with_refind(:project) { create(:project, :repository) } let_it_be_with_refind(:project) { create(:project, :repository) }
...@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do ...@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do
context 'when DAST profiles are not found' do context 'when DAST profiles are not found' do
it 'does not modify the config' do it 'does not modify the config' do
expect(subject).to eq( expect(subject).to eq(
image: 'ruby:2.5.3', image: 'ruby:3.0.1',
'dast-on-demand-0': { allow_failure: true, script: 'echo "Error during On-Demand Scan execution: Dast site profile was not provided" && false' } 'dast-on-demand-0': { allow_failure: true, script: 'echo "Error during On-Demand Scan execution: Dast site profile was not provided" && false' }
) )
end end
...@@ -86,7 +86,7 @@ RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do ...@@ -86,7 +86,7 @@ RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do
let(:expected_configuration) do let(:expected_configuration) do
{ {
image: 'ruby:2.5.3', image: 'ruby:3.0.1',
'dast-on-demand-0': { 'dast-on-demand-0': {
stage: 'test', stage: 'test',
image: { image: {
......
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