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
5ce5abdc
Commit
5ce5abdc
authored
Oct 04, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix hipchat service specs after changes in pipeline
parent
f57cfdb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/models/commit_status.rb
app/models/commit_status.rb
+2
-3
spec/models/project_services/hipchat_service_spec.rb
spec/models/project_services/hipchat_service_spec.rb
+1
-1
No files found.
app/models/commit_status.rb
View file @
5ce5abdc
...
@@ -70,9 +70,8 @@ class CommitStatus < ActiveRecord::Base
...
@@ -70,9 +70,8 @@ class CommitStatus < ActiveRecord::Base
end
end
after_transition
do
|
commit_status
,
transition
|
after_transition
do
|
commit_status
,
transition
|
commit_status
.
pipeline
.
tap
do
|
pipeline
|
commit_status
.
pipeline
.
try
do
|
pipeline
|
return
if
transition
.
loopback?
return
false
if
transition
.
loopback?
return
unless
pipeline
if
commit_status
.
complete?
if
commit_status
.
complete?
ProcessPipelineWorker
.
perform_async
(
pipeline
.
id
)
ProcessPipelineWorker
.
perform_async
(
pipeline
.
id
)
...
...
spec/models/project_services/hipchat_service_spec.rb
View file @
5ce5abdc
...
@@ -283,7 +283,7 @@ describe HipchatService, models: true do
...
@@ -283,7 +283,7 @@ describe HipchatService, models: true do
context
'build events'
do
context
'build events'
do
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:data
)
{
Gitlab
::
DataBuilder
::
Build
.
build
(
build
)
}
let
(
:data
)
{
Gitlab
::
DataBuilder
::
Build
.
build
(
build
.
reload
)
}
context
'for failed'
do
context
'for failed'
do
before
{
build
.
drop
}
before
{
build
.
drop
}
...
...
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