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
109553af
Commit
109553af
authored
Jun 07, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix EE specs after ci_commit rename to pipeline
parent
c3e483b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
app/services/projects/update_pages_service.rb
app/services/projects/update_pages_service.rb
+1
-1
features/steps/project/pages.rb
features/steps/project/pages.rb
+6
-6
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 @
109553af
...
@@ -52,7 +52,7 @@ module Projects
...
@@ -52,7 +52,7 @@ module Projects
def
create_status
def
create_status
GenericCommitStatus
.
new
(
GenericCommitStatus
.
new
(
project:
project
,
project:
project
,
commit:
build
.
commit
,
pipeline:
build
.
pipeline
,
user:
build
.
user
,
user:
build
.
user
,
ref:
build
.
ref
,
ref:
build
.
ref
,
stage:
'deploy'
,
stage:
'deploy'
,
...
...
features/steps/project/pages.rb
View file @
109553af
...
@@ -27,10 +27,10 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
...
@@ -27,10 +27,10 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
end
end
step
'pages are deployed'
do
step
'pages are deployed'
do
commit
=
@project
.
ensure_ci_commit
(
@project
.
commit
(
'HEAD'
).
sha
)
pipeline
=
@project
.
ensure_pipeline
(
@project
.
commit
(
'HEAD'
).
sha
,
'HEAD'
)
build
=
build
(
:ci_build
,
build
=
build
(
:ci_build
,
project:
@project
,
project:
@project
,
commit:
commit
,
pipeline:
pipeline
,
ref:
'HEAD'
,
ref:
'HEAD'
,
artifacts_file:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip'
),
artifacts_file:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip'
),
artifacts_metadata:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip.meta'
)
artifacts_metadata:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip.meta'
)
...
...
spec/services/projects/update_pages_service_spec.rb
View file @
109553af
...
@@ -2,8 +2,8 @@ require "spec_helper"
...
@@ -2,8 +2,8 @@ require "spec_helper"
describe
Projects
::
UpdatePagesService
do
describe
Projects
::
UpdatePagesService
do
let
(
:project
)
{
create
:project
}
let
(
:project
)
{
create
:project
}
let
(
:
commit
)
{
create
:ci_commit
,
project:
project
,
sha:
project
.
commit
(
'HEAD'
).
sha
}
let
(
:
pipeline
)
{
create
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
(
'HEAD'
).
sha
}
let
(
:build
)
{
create
:ci_build
,
commit:
commit
,
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
)
}
...
@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do
...
@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do
end
end
it
'fails if sha on branch is not latest'
do
it
'fails if sha on branch is not latest'
do
commit
.
update_attributes
(
sha:
'old_sha'
)
pipeline
.
update_attributes
(
sha:
'old_sha'
)
build
.
update_attributes
(
artifacts_file:
file
)
build
.
update_attributes
(
artifacts_file:
file
)
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
to_not
eq
(
:success
)
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