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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e2242cdf
Commit
e2242cdf
authored
Nov 12, 2017
by
Zeger-Jan van de Weg
Committed by
Kamil Trzcinski
Dec 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Last test fixes multiple artifacts
parent
ba5697fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+0
-1
No files found.
spec/requests/api/runner_spec.rb
View file @
e2242cdf
...
@@ -1131,7 +1131,7 @@ describe API::Runner do
...
@@ -1131,7 +1131,7 @@ describe API::Runner do
# by configuring this path we allow to pass file from @tmpdir only
# by configuring this path we allow to pass file from @tmpdir only
# but all temporary files are stored in system tmp directory
# but all temporary files are stored in system tmp directory
@tmpdir
=
Dir
.
mktmpdir
@tmpdir
=
Dir
.
mktmpdir
allow
(
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
@tmpdir
)
allow
(
Job
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
@tmpdir
)
end
end
after
do
after
do
...
...
spec/tasks/gitlab/backup_rake_spec.rb
View file @
e2242cdf
...
@@ -24,7 +24,6 @@ describe 'gitlab:app namespace rake task' do
...
@@ -24,7 +24,6 @@ describe 'gitlab:app namespace rake task' do
# We need this directory to run `gitlab:backup:create` task
# We need this directory to run `gitlab:backup:create` task
FileUtils
.
mkdir_p
(
'public/uploads'
)
FileUtils
.
mkdir_p
(
'public/uploads'
)
FileUtils
.
mkdir_p
(
Rails
.
root
.
join
(
'tmp/tests/artifacts'
))
end
end
before
do
before
do
...
...
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