From 519765699b90dd92ddef6d1f5cde5123c7d4b473 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 1 Nov 2018 18:34:20 +0900 Subject: [PATCH] Fix spec --- spec/features/projects/jobs_spec.rb | 4 ++-- spec/models/ci/build_spec.rb | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index d428e63aef9..cbb935abd53 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -396,8 +396,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end context 'job is successful and has deployment' do - let(:build) { create(:ci_build, :success, :trace_live, environment: environment.name, pipeline: pipeline) } - let!(:deployment) { create(:deployment, :success, environment: environment, project: environment.project, deployable: build) } + let(:build) { create(:ci_build, :success, :trace_live, environment: environment.name, pipeline: pipeline, deployment: deployment) } + let(:deployment) { create(:deployment, :success, environment: environment, project: environment.project) } it 'shows a link for the job' do expect(page).to have_link environment.name diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 5fa3059e55f..64f904b66b1 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -3307,12 +3307,5 @@ describe Ci::Build do it { expect(build.deployment_status).to eq(:creating) } end - - context 'when build is successful but deployment is not ready yet' do - let(:build) { create(:ci_build, :success, environment: 'production') } - let(:environment) { create(:environment, name: 'production', project: build.project) } - - it { expect(build.deployment_status).to eq(:creating) } - end end end -- GitLab