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
5b2c873c
Commit
5b2c873c
authored
Sep 08, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix references to ee .gitlab-ci.yml spec fixtures
parent
a5604651
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/lib/gitlab/ci/config_spec.rb
spec/lib/gitlab/ci/config_spec.rb
+1
-1
spec/lib/gitlab/ci/external/processor_spec.rb
spec/lib/gitlab/ci/external/processor_spec.rb
+2
-2
No files found.
spec/lib/gitlab/ci/config_spec.rb
View file @
5b2c873c
...
...
@@ -128,7 +128,7 @@ describe Gitlab::Ci::Config do
context
"when using 'include' directive"
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:remote_location
)
{
'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml'
}
let
(
:local_location
)
{
'
ee/
spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
}
let
(
:local_location
)
{
'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
}
let
(
:remote_file_content
)
do
<<~
HEREDOC
...
...
spec/lib/gitlab/ci/external/processor_spec.rb
View file @
5b2c873c
...
...
@@ -107,7 +107,7 @@ describe Gitlab::Ci::External::Processor do
let
(
:remote_file
)
{
'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml'
}
let
(
:external_files
)
do
[
'/
ee/
spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
,
'/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
,
remote_file
]
end
...
...
@@ -128,7 +128,7 @@ describe Gitlab::Ci::External::Processor do
end
before
do
local_file_content
=
File
.
read
(
Rails
.
root
.
join
(
'
ee/
spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
))
local_file_content
=
File
.
read
(
Rails
.
root
.
join
(
'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'
))
allow_any_instance_of
(
Gitlab
::
Ci
::
External
::
File
::
Local
).
to
receive
(
:fetch_local_content
).
and_return
(
local_file_content
)
WebMock
.
stub_request
(
:get
,
remote_file
).
to_return
(
body:
remote_file_content
)
end
...
...
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