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
Tatuya Kamada
gitlab-ce
Commits
91c07d16
Commit
91c07d16
authored
May 13, 2016
by
Yorick Peterse
Committed by
James Edwards-Jones
Feb 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Rubocop deprecation warnings
parent
12d44272
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/services/projects/update_pages_service.rb
app/services/projects/update_pages_service.rb
+1
-1
spec/services/projects/update_pages_service_spec.rb
spec/services/projects/update_pages_service_spec.rb
+3
-3
No files found.
app/services/projects/update_pages_service.rb
View file @
91c07d16
...
@@ -25,7 +25,7 @@ module Projects
...
@@ -25,7 +25,7 @@ module Projects
# Check if we did extract public directory
# Check if we did extract public directory
archive_public_path
=
File
.
join
(
archive_path
,
'public'
)
archive_public_path
=
File
.
join
(
archive_path
,
'public'
)
raise
'pages miss the public folder'
unless
Dir
.
exist
s
?
(
archive_public_path
)
raise
'pages miss the public folder'
unless
Dir
.
exist?
(
archive_public_path
)
raise
'pages are outdated'
unless
latest?
raise
'pages are outdated'
unless
latest?
deploy_page!
(
archive_public_path
)
deploy_page!
(
archive_public_path
)
...
...
spec/services/projects/update_pages_service_spec.rb
View file @
91c07d16
...
@@ -5,7 +5,7 @@ describe Projects::UpdatePagesService do
...
@@ -5,7 +5,7 @@ describe Projects::UpdatePagesService do
let
(
:pipeline
)
{
create
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
(
'HEAD'
).
sha
}
let
(
:pipeline
)
{
create
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
(
'HEAD'
).
sha
}
let
(
:build
)
{
create
:ci_build
,
pipeline:
pipeline
,
ref:
'HEAD'
}
let
(
:build
)
{
create
:ci_build
,
pipeline:
pipeline
,
ref:
'HEAD'
}
let
(
:invalid_file
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
)
}
let
(
:invalid_file
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
)
}
subject
{
described_class
.
new
(
project
,
build
)
}
subject
{
described_class
.
new
(
project
,
build
)
}
before
do
before
do
...
@@ -18,7 +18,7 @@ describe Projects::UpdatePagesService do
...
@@ -18,7 +18,7 @@ describe Projects::UpdatePagesService do
let
(
:empty_file
)
{
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/pages_empty.
#{
format
}
"
)
}
let
(
:empty_file
)
{
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/pages_empty.
#{
format
}
"
)
}
let
(
:metadata
)
do
let
(
:metadata
)
do
filename
=
Rails
.
root
+
"spec/fixtures/pages.
#{
format
}
.meta"
filename
=
Rails
.
root
+
"spec/fixtures/pages.
#{
format
}
.meta"
fixture_file_upload
(
filename
)
if
File
.
exist
s
?
(
filename
)
fixture_file_upload
(
filename
)
if
File
.
exist?
(
filename
)
end
end
before
do
before
do
...
@@ -73,7 +73,7 @@ describe Projects::UpdatePagesService do
...
@@ -73,7 +73,7 @@ describe Projects::UpdatePagesService do
build
.
update_attributes
(
artifacts_file:
invalid_file
)
build
.
update_attributes
(
artifacts_file:
invalid_file
)
expect
(
execute
).
not_to
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
end
def
execute
def
execute
subject
.
execute
[
:status
]
subject
.
execute
[
:status
]
end
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