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
d79fb3e3
Commit
d79fb3e3
authored
Aug 16, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests which broke in the merge
parent
567ef6c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+2
-2
spec/services/ci/image_for_build_service_spec.rb
spec/services/ci/image_for_build_service_spec.rb
+1
-1
No files found.
spec/requests/api/commits_spec.rb
View file @
d79fb3e3
...
@@ -95,7 +95,7 @@ describe API::API, api: true do
...
@@ -95,7 +95,7 @@ describe API::API, api: true do
end
end
it
"returns status for CI"
do
it
"returns status for CI"
do
pipeline
=
project
.
ensure_pipeline
(
project
.
repository
.
commit
.
sha
,
'master'
)
pipeline
=
project
.
ensure_pipeline
(
'master'
,
project
.
repository
.
commit
.
sha
)
pipeline
.
update
(
status:
'success'
)
pipeline
.
update
(
status:
'success'
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
...
@@ -105,7 +105,7 @@ describe API::API, api: true do
...
@@ -105,7 +105,7 @@ describe API::API, api: true do
end
end
it
"returns status for CI when pipeline is created"
do
it
"returns status for CI when pipeline is created"
do
project
.
ensure_pipeline
(
project
.
repository
.
commit
.
sha
,
'master'
)
project
.
ensure_pipeline
(
'master'
,
project
.
repository
.
commit
.
sha
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
...
...
spec/services/ci/image_for_build_service_spec.rb
View file @
d79fb3e3
...
@@ -5,7 +5,7 @@ module Ci
...
@@ -5,7 +5,7 @@ module Ci
let
(
:service
)
{
ImageForBuildService
.
new
}
let
(
:service
)
{
ImageForBuildService
.
new
}
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
)
}
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
)
}
let
(
:commit_sha
)
{
'01234567890123456789'
}
let
(
:commit_sha
)
{
'01234567890123456789'
}
let
(
:pipeline
)
{
project
.
ensure_pipeline
(
commit_sha
,
'master'
)
}
let
(
:pipeline
)
{
project
.
ensure_pipeline
(
'master'
,
commit_sha
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
pipeline:
pipeline
)
}
describe
'#execute'
do
describe
'#execute'
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