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
Jérome Perrin
gitlab-ce
Commits
836061dd
Commit
836061dd
authored
Jun 03, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename remaining ci_commits in specs
parent
8a4f3193
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
...features/merge_requests/merge_when_build_succeeds_spec.rb
+1
-1
spec/requests/api/commit_statuses_spec.rb
spec/requests/api/commit_statuses_spec.rb
+1
-1
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+2
-2
spec/services/create_commit_builds_service_spec.rb
spec/services/create_commit_builds_service_spec.rb
+1
-1
No files found.
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
View file @
836061dd
...
@@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context
"Active build for Merge Request"
do
context
"Active build for Merge Request"
do
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
sha:
merge_request
.
last_commit
.
id
,
ref:
merge_request
.
source_branch
)
}
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
sha:
merge_request
.
last_commit
.
id
,
ref:
merge_request
.
source_branch
)
}
let!
(
:ci_build
)
{
create
(
:ci_build
,
pipeline:
ci_commit
)
}
let!
(
:ci_build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
before
do
before
do
login_as
user
login_as
user
...
...
spec/requests/api/commit_statuses_spec.rb
View file @
836061dd
...
@@ -5,7 +5,7 @@ describe API::CommitStatuses, api: true do
...
@@ -5,7 +5,7 @@ describe API::CommitStatuses, api: true do
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let
(
:commit
)
{
project
.
repository
.
commit
}
let
(
:commit
)
{
project
.
repository
.
commit
}
let
(
:commit_status
)
{
create
(
:commit_status
,
pipeline:
ci_commit
)
}
let
(
:commit_status
)
{
create
(
:commit_status
,
pipeline:
pipeline
)
}
let
(
:guest
)
{
create_user
(
:guest
)
}
let
(
:guest
)
{
create_user
(
:guest
)
}
let
(
:reporter
)
{
create_user
(
:reporter
)
}
let
(
:reporter
)
{
create_user
(
:reporter
)
}
let
(
:developer
)
{
create_user
(
:developer
)
}
let
(
:developer
)
{
create_user
(
:developer
)
}
...
...
spec/requests/api/commits_spec.rb
View file @
836061dd
...
@@ -90,10 +90,10 @@ describe API::API, api: true do
...
@@ -90,10 +90,10 @@ describe API::API, api: true do
end
end
it
"should return status for CI"
do
it
"should return status for CI"
do
ci_commit
=
project
.
ensure_pipeline
(
project
.
repository
.
commit
.
sha
,
'master'
)
pipeline
=
project
.
ensure_pipeline
(
project
.
repository
.
commit
.
sha
,
'master'
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
'status'
]).
to
eq
(
ci_commit
.
status
)
expect
(
json_response
[
'status'
]).
to
eq
(
pipeline
.
status
)
end
end
end
end
...
...
spec/services/create_commit_builds_service_spec.rb
View file @
836061dd
...
@@ -52,7 +52,7 @@ describe CreateCommitBuildsService, services: true do
...
@@ -52,7 +52,7 @@ describe CreateCommitBuildsService, services: true do
end
end
end
end
it
'skips creating
ci_commit
for refs without .gitlab-ci.yml'
do
it
'skips creating
pipeline
for refs without .gitlab-ci.yml'
do
stub_ci_pipeline_yaml_file
(
nil
)
stub_ci_pipeline_yaml_file
(
nil
)
result
=
service
.
execute
(
project
,
user
,
result
=
service
.
execute
(
project
,
user
,
ref:
'refs/heads/0_1'
,
ref:
'refs/heads/0_1'
,
...
...
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