diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-11-05 04:05:05 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-11-05 04:05:05 +0300 |
commit | 52f7b09127d19f956c289c72d15ca8ab817b8d70 (patch) | |
tree | 3ff60b0899767cc4a9e97cf7aacd02852bd1bf49 | |
parent | c63626c3b5ec1aecb45f7766cb6438e9c6229a0c (diff) |
Fix conflicts
-rw-r--r-- | spec/models/ci/build_spec.rb | 14 | ||||
-rw-r--r-- | spec/workers/build_success_worker_spec.rb | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index e050965e3d9..6fb40f8b146 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -896,20 +896,6 @@ describe Ci::Build do end end - describe '#has_deployment?' do - subject { build.has_deployment? } - - context 'when build has a deployment' do - let!(:deployment) { create(:deployment, deployable: build) } - - it { is_expected.to be_truthy } - end - - context 'when build does not have a deployment' do - it { is_expected.to be_falsy } - end - end - describe '#outdated_deployment?' do subject { build.outdated_deployment? } diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb index deba349a2f4..8e9b178728e 100644 --- a/spec/workers/build_success_worker_spec.rb +++ b/spec/workers/build_success_worker_spec.rb @@ -36,6 +36,7 @@ describe BuildSuccessWorker do expect { subject }.not_to change { Deployment.count } end + end context 'when build is not associated with project' do let!(:build) { create(:ci_build, project: nil) } |