Commit 5d11f55f authored by Steve Azzopardi's avatar Steve Azzopardi

Send deployment_status when job starts environment

The check was if the job `has_environment` which results into showing
the environment information when the job stops the environment. This
result into having a blank `deployment_status`.

Use `starts_environment?` to be the same as the haml we have in 11.3
https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28
parent fbec87b4
...@@ -8,7 +8,7 @@ class BuildDetailsEntity < JobEntity ...@@ -8,7 +8,7 @@ class BuildDetailsEntity < JobEntity
expose :runner, using: RunnerEntity expose :runner, using: RunnerEntity
expose :pipeline, using: PipelineEntity expose :pipeline, using: PipelineEntity
expose :deployment_status, if: -> (*) { build.has_environment? } do expose :deployment_status, if: -> (*) { build.starts_environment? } do
expose :deployment_status, as: :status expose :deployment_status, as: :status
expose :persisted_environment, as: :environment, with: EnvironmentEntity expose :persisted_environment, as: :environment, with: EnvironmentEntity
......
...@@ -423,6 +423,31 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -423,6 +423,31 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end end
end end
context 'when job stops environment', :js do
let(:environment) { create(:environment, name: 'production', project: project) }
let(:build) do
create(
:ci_build,
:success,
:trace_live,
environment: environment.name,
pipeline: pipeline,
options: { environment: { action: 'stop' } }
)
end
before do
visit project_job_path(project, build)
wait_for_requests
end
it 'does not show environment information banner' do
expect(page).not_to have_selector('.js-environment-container')
expect(page).not_to have_selector('.environment-information')
expect(page).not_to have_text(environment.name)
end
end
describe 'environment info in job view', :js do describe 'environment info in job view', :js do
before do before do
visit project_job_path(project, job) visit project_job_path(project, job)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment