Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e0057d51
Commit
e0057d51
authored
Mar 15, 2020
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Ruby 2.7 in specs to remove Ruby 2.1/2.2/2.3
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
62945ef8
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
91 additions
and
86 deletions
+91
-86
changelogs/unreleased/195165-replace-eol-ruby-versions-in-specs.yml
.../unreleased/195165-replace-eol-ruby-versions-in-specs.yml
+5
-0
ee/spec/lib/ee/gitlab/path_regex_spec.rb
ee/spec/lib/ee/gitlab/path_regex_spec.rb
+1
-1
ee/spec/lib/gitlab/web_ide/config_spec.rb
ee/spec/lib/gitlab/web_ide/config_spec.rb
+2
-2
ee/spec/models/web_ide_terminal_spec.rb
ee/spec/models/web_ide_terminal_spec.rb
+3
-3
ee/spec/services/ci/create_web_ide_terminal_service_spec.rb
ee/spec/services/ci/create_web_ide_terminal_service_spec.rb
+1
-1
ee/spec/services/dependency_proxy/download_blob_service_spec.rb
...c/services/dependency_proxy/download_blob_service_spec.rb
+1
-1
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+2
-2
spec/lib/gitlab/ci/build/image_spec.rb
spec/lib/gitlab/ci/build/image_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/image_spec.rb
spec/lib/gitlab/ci/config/entry/image_spec.rb
+8
-8
spec/lib/gitlab/ci/config/entry/root_spec.rb
spec/lib/gitlab/ci/config/entry/root_spec.rb
+7
-7
spec/lib/gitlab/ci/config/external/file/project_spec.rb
spec/lib/gitlab/ci/config/external/file/project_spec.rb
+2
-2
spec/lib/gitlab/ci/config/external/mapper_spec.rb
spec/lib/gitlab/ci/config/external/mapper_spec.rb
+13
-13
spec/lib/gitlab/ci/config/external/processor_spec.rb
spec/lib/gitlab/ci/config/external/processor_spec.rb
+10
-10
spec/lib/gitlab/ci/config_spec.rb
spec/lib/gitlab/ci/config_spec.rb
+13
-13
spec/lib/gitlab/ci/yaml_processor_spec.rb
spec/lib/gitlab/ci/yaml_processor_spec.rb
+10
-10
spec/lib/gitlab/config/loader/yaml_spec.rb
spec/lib/gitlab/config/loader/yaml_spec.rb
+2
-2
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+3
-3
spec/requests/api/lint_spec.rb
spec/requests/api/lint_spec.rb
+1
-1
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+5
-5
No files found.
changelogs/unreleased/195165-replace-eol-ruby-versions-in-specs.yml
0 → 100644
View file @
e0057d51
---
title
:
Use Ruby 2.7 in specs to remove Ruby 2.1/2.2/2.3
merge_request
:
27269
author
:
Takuya Noguchi
type
:
other
ee/spec/lib/ee/gitlab/path_regex_spec.rb
View file @
e0057d51
...
...
@@ -16,7 +16,7 @@ describe Gitlab::PathRegex do
end
it
'does not match other non-word characters'
do
expect
(
subject
.
match
(
'ruby:2.
3.6
'
)[
0
]).
to
eq
(
'ruby'
)
expect
(
subject
.
match
(
'ruby:2.
7.0
'
)[
0
]).
to
eq
(
'ruby'
)
end
end
...
...
ee/spec/lib/gitlab/web_ide/config_spec.rb
View file @
e0057d51
...
...
@@ -11,7 +11,7 @@ describe Gitlab::WebIde::Config do
let
(
:yml
)
do
<<-
EOS
terminal:
image: ruby:2.
2
image: ruby:2.
7
before_script:
- gem install rspec
EOS
...
...
@@ -21,7 +21,7 @@ describe Gitlab::WebIde::Config do
it
'returns hash created from string'
do
hash
=
{
terminal:
{
image:
'ruby:2.
2
'
,
image:
'ruby:2.
7
'
,
before_script:
[
'gem install rspec'
]
}
}
...
...
ee/spec/models/web_ide_terminal_spec.rb
View file @
e0057d51
...
...
@@ -41,7 +41,7 @@ describe WebIdeTerminal do
context
'when image does not have an alias'
do
let
(
:config
)
do
{
image:
'ruby:2.
1
'
}.
merge
(
services_with_aliases
)
{
image:
'ruby:2.
7
'
}.
merge
(
services_with_aliases
)
end
it
'returns services aliases'
do
...
...
@@ -51,7 +51,7 @@ describe WebIdeTerminal do
context
'when both image and services have aliases'
do
let
(
:config
)
do
{
image:
{
name:
'ruby:2.
1
'
,
alias:
'ruby'
}
}.
merge
(
services_with_aliases
)
{
image:
{
name:
'ruby:2.
7
'
,
alias:
'ruby'
}
}.
merge
(
services_with_aliases
)
end
it
'returns all aliases'
do
...
...
@@ -61,7 +61,7 @@ describe WebIdeTerminal do
context
'when image and services does not have any alias'
do
let
(
:config
)
do
{
image:
'ruby:2.
1
'
,
services:
[
'postgres'
]
}
{
image:
'ruby:2.
7
'
,
services:
[
'postgres'
]
}
end
it
'returns an empty array'
do
...
...
ee/spec/services/ci/create_web_ide_terminal_service_spec.rb
View file @
e0057d51
...
...
@@ -56,7 +56,7 @@ describe Ci::CreateWebIdeTerminalService do
<<-
EOS
terminal:
image:
name: ruby:2.
2
name: ruby:2.
7
ports:
- 80
script: rspec
...
...
ee/spec/services/dependency_proxy/download_blob_service_spec.rb
View file @
e0057d51
...
...
@@ -6,7 +6,7 @@ describe DependencyProxy::DownloadBlobService do
let
(
:image
)
{
'alpine'
}
let
(
:token
)
{
Digest
::
SHA256
.
hexdigest
(
'123'
)
}
let
(
:blob_sha
)
{
Digest
::
SHA256
.
hexdigest
(
'ruby:2.
3.9
'
)
}
let
(
:blob_sha
)
{
Digest
::
SHA256
.
hexdigest
(
'ruby:2.
7.0
'
)
}
subject
{
described_class
.
new
(
image
,
blob_sha
,
token
).
execute
}
...
...
spec/factories/ci/builds.rb
View file @
e0057d51
...
...
@@ -16,7 +16,7 @@ FactoryBot.define do
options
do
{
image:
'ruby:2.
1
'
,
image:
'ruby:2.
7
'
,
services:
[
'postgres'
],
script:
[
'ls -a'
]
}
...
...
@@ -330,7 +330,7 @@ FactoryBot.define do
trait
:extended_options
do
options
do
{
image:
{
name:
'ruby:2.
1
'
,
entrypoint:
'/bin/sh'
},
image:
{
name:
'ruby:2.
7
'
,
entrypoint:
'/bin/sh'
},
services:
[
'postgres'
,
{
name:
'docker:stable-dind'
,
entrypoint:
'/bin/sh'
,
command:
'sleep 30'
,
alias:
'docker'
}],
script:
%w(echo)
,
after_script:
%w(ls date)
,
...
...
spec/lib/gitlab/ci/build/image_spec.rb
View file @
e0057d51
...
...
@@ -9,7 +9,7 @@ describe Gitlab::Ci::Build::Image do
subject
{
described_class
.
from_image
(
job
)
}
context
'when image is defined in job'
do
let
(
:image_name
)
{
'ruby:2.
1
'
}
let
(
:image_name
)
{
'ruby:2.
7
'
}
let
(
:job
)
{
create
(
:ci_build
,
options:
{
image:
image_name
}
)
}
context
'when image is defined as string'
do
...
...
spec/lib/gitlab/ci/config/entry/image_spec.rb
View file @
e0057d51
...
...
@@ -6,11 +6,11 @@ describe Gitlab::Ci::Config::Entry::Image do
let
(
:entry
)
{
described_class
.
new
(
config
)
}
context
'when configuration is a string'
do
let
(
:config
)
{
'ruby:2.
2
'
}
let
(
:config
)
{
'ruby:2.
7
'
}
describe
'#value'
do
it
'returns image hash'
do
expect
(
entry
.
value
).
to
eq
({
name:
'ruby:2.
2
'
})
expect
(
entry
.
value
).
to
eq
({
name:
'ruby:2.
7
'
})
end
end
...
...
@@ -28,7 +28,7 @@ describe Gitlab::Ci::Config::Entry::Image do
describe
'#image'
do
it
"returns image's name"
do
expect
(
entry
.
name
).
to
eq
'ruby:2.
2
'
expect
(
entry
.
name
).
to
eq
'ruby:2.
7
'
end
end
...
...
@@ -46,7 +46,7 @@ describe Gitlab::Ci::Config::Entry::Image do
end
context
'when configuration is a hash'
do
let
(
:config
)
{
{
name:
'ruby:2.
2
'
,
entrypoint:
%w(/bin/sh run)
}
}
let
(
:config
)
{
{
name:
'ruby:2.
7
'
,
entrypoint:
%w(/bin/sh run)
}
}
describe
'#value'
do
it
'returns image hash'
do
...
...
@@ -68,7 +68,7 @@ describe Gitlab::Ci::Config::Entry::Image do
describe
'#image'
do
it
"returns image's name"
do
expect
(
entry
.
name
).
to
eq
'ruby:2.
2
'
expect
(
entry
.
name
).
to
eq
'ruby:2.
7
'
end
end
...
...
@@ -80,7 +80,7 @@ describe Gitlab::Ci::Config::Entry::Image do
context
'when configuration has ports'
do
let
(
:ports
)
{
[{
number:
80
,
protocol:
'http'
,
name:
'foobar'
}]
}
let
(
:config
)
{
{
name:
'ruby:2.
2
'
,
entrypoint:
%w(/bin/sh run)
,
ports:
ports
}
}
let
(
:config
)
{
{
name:
'ruby:2.
7
'
,
entrypoint:
%w(/bin/sh run)
,
ports:
ports
}
}
let
(
:entry
)
{
described_class
.
new
(
config
,
{
with_image_ports:
image_ports
})
}
let
(
:image_ports
)
{
false
}
...
...
@@ -112,7 +112,7 @@ describe Gitlab::Ci::Config::Entry::Image do
end
context
'when entry value is not correct'
do
let
(
:config
)
{
[
'ruby:2.
2
'
]
}
let
(
:config
)
{
[
'ruby:2.
7
'
]
}
describe
'#errors'
do
it
'saves errors'
do
...
...
@@ -129,7 +129,7 @@ describe Gitlab::Ci::Config::Entry::Image do
end
context
'when unexpected key is specified'
do
let
(
:config
)
{
{
name:
'ruby:2.
2
'
,
non_existing:
'test'
}
}
let
(
:config
)
{
{
name:
'ruby:2.
7
'
,
non_existing:
'test'
}
}
describe
'#errors'
do
it
'saves errors'
do
...
...
spec/lib/gitlab/ci/config/entry/root_spec.rb
View file @
e0057d51
...
...
@@ -29,7 +29,7 @@ describe Gitlab::Ci::Config::Entry::Root do
let
(
:hash
)
do
{
before_script:
%w(ls pwd)
,
image:
'ruby:2.
2
'
,
image:
'ruby:2.
7
'
,
default:
{},
services:
[
'postgres:9.1'
,
'mysql:5.5'
],
variables:
{
VAR
:
'root'
},
...
...
@@ -124,7 +124,7 @@ describe Gitlab::Ci::Config::Entry::Root do
{
name: :rspec
,
script:
%w[rspec ls]
,
before_script:
%w(ls pwd)
,
image:
{
name:
'ruby:2.
2
'
},
image:
{
name:
'ruby:2.
7
'
},
services:
[{
name:
'postgres:9.1'
},
{
name:
'mysql:5.5'
}],
stage:
'test'
,
cache:
{
key:
'k'
,
untracked:
true
,
paths:
[
'public/'
],
policy:
'pull-push'
},
...
...
@@ -138,7 +138,7 @@ describe Gitlab::Ci::Config::Entry::Root do
{
name: :spinach
,
before_script:
[],
script:
%w[spinach]
,
image:
{
name:
'ruby:2.
2
'
},
image:
{
name:
'ruby:2.
7
'
},
services:
[{
name:
'postgres:9.1'
},
{
name:
'mysql:5.5'
}],
stage:
'test'
,
cache:
{
key:
'k'
,
untracked:
true
,
paths:
[
'public/'
],
policy:
'pull-push'
},
...
...
@@ -154,7 +154,7 @@ describe Gitlab::Ci::Config::Entry::Root do
before_script:
[],
script:
[
"make changelog | tee release_changelog.txt"
],
release:
{
name:
"Release $CI_TAG_NAME"
,
tag_name:
'v0.06'
,
description:
"./release_changelog.txt"
},
image:
{
name:
"ruby:2.
2
"
},
image:
{
name:
"ruby:2.
7
"
},
services:
[{
name:
"postgres:9.1"
},
{
name:
"mysql:5.5"
}],
cache:
{
key:
"k"
,
untracked:
true
,
paths:
[
"public/"
],
policy:
"pull-push"
},
only:
{
refs:
%w(branches tags)
},
...
...
@@ -173,7 +173,7 @@ describe Gitlab::Ci::Config::Entry::Root do
{
before_script:
%w(ls pwd)
,
after_script:
[
'make clean'
],
default:
{
image:
'ruby:2.
1
'
,
image:
'ruby:2.
7
'
,
services:
[
'postgres:9.1'
,
'mysql:5.5'
]
},
variables:
{
VAR
:
'root'
},
...
...
@@ -200,7 +200,7 @@ describe Gitlab::Ci::Config::Entry::Root do
rspec:
{
name: :rspec
,
script:
%w[rspec ls]
,
before_script:
%w(ls pwd)
,
image:
{
name:
'ruby:2.
1
'
},
image:
{
name:
'ruby:2.
7
'
},
services:
[{
name:
'postgres:9.1'
},
{
name:
'mysql:5.5'
}],
stage:
'test'
,
cache:
{
key:
'k'
,
untracked:
true
,
paths:
[
'public/'
],
policy:
"pull-push"
},
...
...
@@ -212,7 +212,7 @@ describe Gitlab::Ci::Config::Entry::Root do
spinach:
{
name: :spinach
,
before_script:
[],
script:
%w[spinach]
,
image:
{
name:
'ruby:2.
1
'
},
image:
{
name:
'ruby:2.
7
'
},
services:
[{
name:
'postgres:9.1'
},
{
name:
'mysql:5.5'
}],
stage:
'test'
,
cache:
{
key:
'k'
,
untracked:
true
,
paths:
[
'public/'
],
policy:
"pull-push"
},
...
...
spec/lib/gitlab/ci/config/external/file/project_spec.rb
View file @
e0057d51
...
...
@@ -71,7 +71,7 @@ describe Gitlab::Ci::Config::External::File::Project do
let
(
:root_ref_sha
)
{
project
.
repository
.
root_ref_sha
}
before
do
stub_project_blob
(
root_ref_sha
,
'/file.yml'
)
{
'image: ruby:2.
1
'
}
stub_project_blob
(
root_ref_sha
,
'/file.yml'
)
{
'image: ruby:2.
7
'
}
end
it
'returns true'
do
...
...
@@ -96,7 +96,7 @@ describe Gitlab::Ci::Config::External::File::Project do
let
(
:ref_sha
)
{
project
.
commit
(
'master'
).
sha
}
before
do
stub_project_blob
(
ref_sha
,
'/file.yml'
)
{
'image: ruby:2.
1
'
}
stub_project_blob
(
ref_sha
,
'/file.yml'
)
{
'image: ruby:2.
7
'
}
end
it
'returns true'
do
...
...
spec/lib/gitlab/ci/config/external/mapper_spec.rb
View file @
e0057d51
...
...
@@ -15,7 +15,7 @@ describe Gitlab::Ci::Config::External::Mapper do
let
(
:file_content
)
do
<<~
HEREDOC
image: 'ruby:2.
2
'
image: 'ruby:2.
7
'
HEREDOC
end
...
...
@@ -34,7 +34,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the string is a local file'
do
let
(
:values
)
do
{
include:
local_file
,
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns File instances'
do
...
...
@@ -46,7 +46,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the key is a local file hash'
do
let
(
:values
)
do
{
include:
{
'local'
=>
local_file
},
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns File instances'
do
...
...
@@ -57,7 +57,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the string is a remote file'
do
let
(
:values
)
do
{
include:
remote_url
,
image:
'ruby:2.
2
'
}
{
include:
remote_url
,
image:
'ruby:2.
7
'
}
end
it
'returns File instances'
do
...
...
@@ -69,7 +69,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the key is a remote file hash'
do
let
(
:values
)
do
{
include:
{
'remote'
=>
remote_url
},
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns File instances'
do
...
...
@@ -81,7 +81,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the key is a template file hash'
do
let
(
:values
)
do
{
include:
{
'template'
=>
template_file
},
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns File instances'
do
...
...
@@ -93,7 +93,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when the key is a hash of file and remote'
do
let
(
:values
)
do
{
include:
{
'local'
=>
local_file
,
'remote'
=>
remote_url
},
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns ambigious specification error'
do
...
...
@@ -105,7 +105,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
"when 'include' is defined as an array"
do
let
(
:values
)
do
{
include:
[
remote_url
,
local_file
],
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns Files instances'
do
...
...
@@ -117,7 +117,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
"when 'include' is defined as an array of hashes"
do
let
(
:values
)
do
{
include:
[{
remote:
remote_url
},
{
local:
local_file
}],
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns Files instances'
do
...
...
@@ -128,7 +128,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
'when it has ambigious match'
do
let
(
:values
)
do
{
include:
[{
remote:
remote_url
,
local:
local_file
}],
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'returns ambigious specification error'
do
...
...
@@ -140,7 +140,7 @@ describe Gitlab::Ci::Config::External::Mapper do
context
"when 'include' is not defined"
do
let
(
:values
)
do
{
image:
'ruby:2.
2
'
image:
'ruby:2.
7
'
}
end
...
...
@@ -155,7 +155,7 @@ describe Gitlab::Ci::Config::External::Mapper do
{
'local'
=>
local_file
},
{
'local'
=>
local_file
}
],
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
it
'raises an exception'
do
...
...
@@ -169,7 +169,7 @@ describe Gitlab::Ci::Config::External::Mapper do
{
'local'
=>
local_file
},
{
'remote'
=>
remote_url
}
],
image:
'ruby:2.
2
'
}
image:
'ruby:2.
7
'
}
end
before
do
...
...
spec/lib/gitlab/ci/config/external/processor_spec.rb
View file @
e0057d51
...
...
@@ -24,7 +24,7 @@ describe Gitlab::Ci::Config::External::Processor do
subject
{
processor
.
perform
}
context
'when no external files defined'
do
let
(
:values
)
{
{
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
image:
'ruby:2.
7
'
}
}
it
'returns the same values'
do
expect
(
processor
.
perform
).
to
eq
(
values
)
...
...
@@ -32,7 +32,7 @@ describe Gitlab::Ci::Config::External::Processor do
end
context
'when an invalid local file is defined'
do
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/non-existent-file.yml'
,
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/non-existent-file.yml'
,
image:
'ruby:2.
7
'
}
}
it
'raises an error'
do
expect
{
processor
.
perform
}.
to
raise_error
(
...
...
@@ -44,7 +44,7 @@ describe Gitlab::Ci::Config::External::Processor do
context
'when an invalid remote file is defined'
do
let
(
:remote_file
)
{
'http://doesntexist.com/.gitlab-ci-1.yml'
}
let
(
:values
)
{
{
include:
remote_file
,
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
include:
remote_file
,
image:
'ruby:2.
7
'
}
}
before
do
stub_full_request
(
remote_file
).
and_raise
(
SocketError
.
new
(
'Some HTTP error'
))
...
...
@@ -60,7 +60,7 @@ describe Gitlab::Ci::Config::External::Processor do
context
'with a valid remote external file is defined'
do
let
(
:remote_file
)
{
'https://gitlab.com/gitlab-org/gitlab-foss/blob/1234/.gitlab-ci-1.yml'
}
let
(
:values
)
{
{
include:
remote_file
,
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
include:
remote_file
,
image:
'ruby:2.
7
'
}
}
let
(
:external_file_content
)
do
<<-
HEREDOC
before_script:
...
...
@@ -94,7 +94,7 @@ describe Gitlab::Ci::Config::External::Processor do
end
context
'with a valid local external file is defined'
do
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/template.yml'
,
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/template.yml'
,
image:
'ruby:2.
7
'
}
}
let
(
:local_file_content
)
do
<<-
HEREDOC
before_script:
...
...
@@ -131,7 +131,7 @@ describe Gitlab::Ci::Config::External::Processor do
let
(
:values
)
do
{
include:
external_files
,
image:
'ruby:2.
2
'
image:
'ruby:2.
7
'
}
end
...
...
@@ -163,7 +163,7 @@ describe Gitlab::Ci::Config::External::Processor do
end
context
'when external files are defined but not valid'
do
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/template.yml'
,
image:
'ruby:2.
2
'
}
}
let
(
:values
)
{
{
include:
'/lib/gitlab/ci/templates/template.yml'
,
image:
'ruby:2.
7
'
}
}
let
(
:local_file_content
)
{
'invalid content file ////'
}
...
...
@@ -185,7 +185,7 @@ describe Gitlab::Ci::Config::External::Processor do
let
(
:values
)
do
{
include:
remote_file
,
image:
'ruby:2.
2
'
image:
'ruby:2.
7
'
}
end
...
...
@@ -198,7 +198,7 @@ describe Gitlab::Ci::Config::External::Processor do
it
'takes precedence'
do
stub_full_request
(
remote_file
).
to_return
(
body:
remote_file_content
)
expect
(
processor
.
perform
[
:image
]).
to
eq
(
'ruby:2.
2
'
)
expect
(
processor
.
perform
[
:image
]).
to
eq
(
'ruby:2.
7
'
)
end
end
...
...
@@ -208,7 +208,7 @@ describe Gitlab::Ci::Config::External::Processor do
include:
[
{
local:
'/local/file.yml'
}
],
image:
'ruby:2.
2
'
image:
'ruby:2.
7
'
}
end
...
...
spec/lib/gitlab/ci/config_spec.rb
View file @
e0057d51
...
...
@@ -20,7 +20,7 @@ describe Gitlab::Ci::Config do
context
'when config is valid'
do
let
(
:yml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
rspec:
script:
...
...
@@ -32,7 +32,7 @@ describe Gitlab::Ci::Config do
describe
'#to_hash'
do
it
'returns hash created from string'
do
hash
=
{
image:
'ruby:2.
2
'
,
image:
'ruby:2.
7
'
,
rspec:
{
script:
[
'gem install rspec'
,
'rspec'
]
...
...
@@ -105,7 +105,7 @@ describe Gitlab::Ci::Config do
context
'when using extendable hash'
do
let
(
:yml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
rspec:
script: rspec
...
...
@@ -118,7 +118,7 @@ describe Gitlab::Ci::Config do
it
'correctly extends the hash'
do
hash
=
{
image:
'ruby:2.
2
'
,
image:
'ruby:2.
7
'
,
rspec:
{
script:
'rspec'
},
test:
{
extends:
'rspec'
,
...
...
@@ -208,7 +208,7 @@ describe Gitlab::Ci::Config do
let
(
:yml
)
do
<<-
EOS
image:
name: ruby:2.
2
name: ruby:2.
7
ports:
- 80
EOS
...
...
@@ -222,12 +222,12 @@ describe Gitlab::Ci::Config do
context
'in the job image'
do
let
(
:yml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
test:
script: rspec
image:
name: ruby:2.
2
name: ruby:2.
7
ports:
- 80
EOS
...
...
@@ -241,11 +241,11 @@ describe Gitlab::Ci::Config do
context
'in the services'
do
let
(
:yml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
test:
script: rspec
image: ruby:2.
2
image: ruby:2.
7
services:
- name: test
alias: test
...
...
@@ -286,7 +286,7 @@ describe Gitlab::Ci::Config do
-
#{
local_location
}
-
#{
remote_location
}
image: ruby:2.
2
image: ruby:2.
7
HEREDOC
end
...
...
@@ -316,7 +316,7 @@ describe Gitlab::Ci::Config do
}
composed_hash
=
{
before_script:
before_script_values
,
image:
"ruby:2.
2
"
,
image:
"ruby:2.
7
"
,
rspec:
{
script:
[
"bundle exec rspec"
]
},
variables:
variables
}
...
...
@@ -401,7 +401,7 @@ describe Gitlab::Ci::Config do
include:
-
#{
remote_location
}
image: ruby:2.
2
image: ruby:2.
7
HEREDOC
end
...
...
@@ -412,7 +412,7 @@ describe Gitlab::Ci::Config do
end
it
'takes precedence'
do
expect
(
config
.
to_hash
).
to
eq
({
image:
'ruby:2.
2
'
})
expect
(
config
.
to_hash
).
to
eq
({
image:
'ruby:2.
7
'
})
end
end
...
...
spec/lib/gitlab/ci/yaml_processor_spec.rb
View file @
e0057d51
...
...
@@ -665,7 +665,7 @@ module Gitlab
describe
"Image and service handling"
do
context
"when extended docker configuration is used"
do
it
"returns image and service when defined"
do
config
=
YAML
.
dump
({
image:
{
name:
"ruby:2.
1
"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
config
=
YAML
.
dump
({
image:
{
name:
"ruby:2.
7
"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
services:
[
"mysql"
,
{
name:
"docker:dind"
,
alias:
"docker"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
],
command:
[
"/usr/local/bin/init"
,
"run"
]
}],
...
...
@@ -683,7 +683,7 @@ module Gitlab
options:
{
before_script:
[
"pwd"
],
script:
[
"rspec"
],
image:
{
name:
"ruby:2.
1
"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
image:
{
name:
"ruby:2.
7
"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
services:
[{
name:
"mysql"
},
{
name:
"docker:dind"
,
alias:
"docker"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
],
command:
[
"/usr/local/bin/init"
,
"run"
]
}]
...
...
@@ -696,7 +696,7 @@ module Gitlab
end
it
"returns image and service when overridden for job"
do
config
=
YAML
.
dump
({
image:
"ruby:2.
1
"
,
config
=
YAML
.
dump
({
image:
"ruby:2.
7
"
,
services:
[
"mysql"
],
before_script:
[
"pwd"
],
rspec:
{
image:
{
name:
"ruby:2.5"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
...
...
@@ -731,7 +731,7 @@ module Gitlab
context
"when etended docker configuration is not used"
do
it
"returns image and service when defined"
do
config
=
YAML
.
dump
({
image:
"ruby:2.
1
"
,
config
=
YAML
.
dump
({
image:
"ruby:2.
7
"
,
services:
[
"mysql"
,
"docker:dind"
],
before_script:
[
"pwd"
],
rspec:
{
script:
"rspec"
}
})
...
...
@@ -747,7 +747,7 @@ module Gitlab
options:
{
before_script:
[
"pwd"
],
script:
[
"rspec"
],
image:
{
name:
"ruby:2.
1
"
},
image:
{
name:
"ruby:2.
7
"
},
services:
[{
name:
"mysql"
},
{
name:
"docker:dind"
}]
},
allow_failure:
false
,
...
...
@@ -758,7 +758,7 @@ module Gitlab
end
it
"returns image and service when overridden for job"
do
config
=
YAML
.
dump
({
image:
"ruby:2.
1
"
,
config
=
YAML
.
dump
({
image:
"ruby:2.
7
"
,
services:
[
"mysql"
],
before_script:
[
"pwd"
],
rspec:
{
image:
"ruby:2.5"
,
services:
[
"postgresql"
,
"docker:dind"
],
script:
"rspec"
}
})
...
...
@@ -1292,7 +1292,7 @@ module Gitlab
describe
"Artifacts"
do
it
"returns artifacts when defined"
do
config
=
YAML
.
dump
({
image:
"ruby:2.
1
"
,
image:
"ruby:2.
7
"
,
services:
[
"mysql"
],
before_script:
[
"pwd"
],
rspec:
{
...
...
@@ -1318,7 +1318,7 @@ module Gitlab
options:
{
before_script:
[
"pwd"
],
script:
[
"rspec"
],
image:
{
name:
"ruby:2.
1
"
},
image:
{
name:
"ruby:2.
7
"
},
services:
[{
name:
"mysql"
}],
artifacts:
{
name:
"custom_name"
,
...
...
@@ -1945,7 +1945,7 @@ module Gitlab
context
'when hidden job have a script definition'
do
let
(
:config
)
do
YAML
.
dump
({
'.hidden_job'
=>
{
image:
'ruby:2.
1
'
,
script:
'test'
},
'.hidden_job'
=>
{
image:
'ruby:2.
7
'
,
script:
'test'
},
'normal_job'
=>
{
script:
'test'
}
})
end
...
...
@@ -1956,7 +1956,7 @@ module Gitlab
context
"when hidden job doesn't have a script definition"
do
let
(
:config
)
do
YAML
.
dump
({
'.hidden_job'
=>
{
image:
'ruby:2.
1
'
},
'.hidden_job'
=>
{
image:
'ruby:2.
7
'
},
'normal_job'
=>
{
script:
'test'
}
})
end
...
...
spec/lib/gitlab/config/loader/yaml_spec.rb
View file @
e0057d51
...
...
@@ -6,7 +6,7 @@ describe Gitlab::Config::Loader::Yaml do
let
(
:loader
)
{
described_class
.
new
(
yml
)
}
context
'when yaml syntax is correct'
do
let
(
:yml
)
{
'image: ruby:2.
2
'
}
let
(
:yml
)
{
'image: ruby:2.
7
'
}
describe
'#valid?'
do
it
'returns true'
do
...
...
@@ -16,7 +16,7 @@ describe Gitlab::Config::Loader::Yaml do
describe
'#load!'
do
it
'returns a valid hash'
do
expect
(
loader
.
load!
).
to
eq
(
image:
'ruby:2.
2
'
)
expect
(
loader
.
load!
).
to
eq
(
image:
'ruby:2.
7
'
)
end
end
end
...
...
spec/models/ci/build_spec.rb
View file @
e0057d51
...
...
@@ -2023,7 +2023,7 @@ describe Ci::Build do
describe
'#options'
do
let
(
:options
)
do
{
image:
"ruby:2.
1
"
,
image:
"ruby:2.
7
"
,
services:
[
"postgres"
],
script:
[
"ls -a"
]
}
...
...
@@ -2034,11 +2034,11 @@ describe Ci::Build do
end
it
'allows to access with keys'
do
expect
(
build
.
options
[
:image
]).
to
eq
(
'ruby:2.
1
'
)
expect
(
build
.
options
[
:image
]).
to
eq
(
'ruby:2.
7
'
)
end
it
'allows to access with strings'
do
expect
(
build
.
options
[
'image'
]).
to
eq
(
'ruby:2.
1
'
)
expect
(
build
.
options
[
'image'
]).
to
eq
(
'ruby:2.
7
'
)
end
context
'when ci_build_metadata_config is set'
do
...
...
spec/requests/api/lint_spec.rb
View file @
e0057d51
...
...
@@ -29,7 +29,7 @@ describe API::Lint do
end
it
"responds with errors about invalid configuration"
do
post
api
(
'/ci/lint'
),
params:
{
content:
'{ image: "ruby:2.
1
", services: ["postgres"] }'
}
post
api
(
'/ci/lint'
),
params:
{
content:
'{ image: "ruby:2.
7
", services: ["postgres"] }'
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'status'
]).
to
eq
(
'invalid'
)
...
...
spec/requests/api/runner_spec.rb
View file @
e0057d51
...
...
@@ -523,7 +523,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
expect
(
json_response
[
'token'
]).
to
eq
(
job
.
token
)
expect
(
json_response
[
'job_info'
]).
to
eq
(
expected_job_info
)
expect
(
json_response
[
'git_info'
]).
to
eq
(
expected_git_info
)
expect
(
json_response
[
'image'
]).
to
eq
({
'name'
=>
'ruby:2.
1
'
,
'entrypoint'
=>
'/bin/sh'
,
'ports'
=>
[]
})
expect
(
json_response
[
'image'
]).
to
eq
({
'name'
=>
'ruby:2.
7
'
,
'entrypoint'
=>
'/bin/sh'
,
'ports'
=>
[]
})
expect
(
json_response
[
'services'
]).
to
eq
([{
'name'
=>
'postgres'
,
'entrypoint'
=>
nil
,
'alias'
=>
nil
,
'command'
=>
nil
,
'ports'
=>
[]
},
{
'name'
=>
'docker:stable-dind'
,
'entrypoint'
=>
'/bin/sh'
,
...
...
spec/services/ci/create_pipeline_service_spec.rb
View file @
e0057d51
...
...
@@ -555,7 +555,7 @@ describe Ci::CreatePipelineService do
let
(
:ci_yaml
)
do
<<-
EOS
image:
name: ruby:2.
2
name: ruby:2.
7
ports:
- 80
EOS
...
...
@@ -567,12 +567,12 @@ describe Ci::CreatePipelineService do
context
'in the job image'
do
let
(
:ci_yaml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
test:
script: rspec
image:
name: ruby:2.
2
name: ruby:2.
7
ports:
- 80
EOS
...
...
@@ -584,11 +584,11 @@ describe Ci::CreatePipelineService do
context
'in the service'
do
let
(
:ci_yaml
)
do
<<-
EOS
image: ruby:2.
2
image: ruby:2.
7
test:
script: rspec
image: ruby:2.
2
image: ruby:2.
7
services:
- name: test
ports:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment