diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 18:10:28 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 18:10:28 +0300 |
| commit | 0b0a53ee5ec3782c6c7e166f69f190e820232fb0 (patch) | |
| tree | b2cd0518594a933ec2c68c2f883026bb82da3569 /spec/models/project_services/hipchat_service_spec.rb | |
| parent | 0b52517049fc8ac01407018c8a6225d7788861a3 (diff) | |
| parent | 4c29c25497c9a20a5d1f57cd287123cd41edad96 (diff) | |
Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack
# Conflicts:
# app/models/ci/pipeline.rb
# app/services/ci/create_pipeline_service.rb
# spec/models/project_services/hipchat_service_spec.rb
Diffstat (limited to 'spec/models/project_services/hipchat_service_spec.rb')
| -rw-r--r-- | spec/models/project_services/hipchat_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb index 878afa13f1f..bb6c75d6050 100644 --- a/spec/models/project_services/hipchat_service_spec.rb +++ b/spec/models/project_services/hipchat_service_spec.rb @@ -301,7 +301,8 @@ describe HipchatService, models: true do end context 'build events' do - let(:build) { create(:ci_build) } + let(:pipeline) { create(:ci_empty_pipeline) } + let(:build) { create(:ci_build, pipeline: pipeline) } let(:data) { Gitlab::DataBuilder::BuildDataBuilder.build(build) } context 'for failed' do |