diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-05 09:10:10 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-05 09:10:10 +0000 |
| commit | c350f3ccd8e72d2e655210c74e508e7720763eb7 (patch) | |
| tree | e3b9a11652d662ec54b5771d0f1585cbde2c7f4c | |
| parent | 986c0578ed6fb4c5c14635d95c4b941072ee54d8 (diff) | |
| parent | d20d52f541a0905a31b9773f0a2ea83ca6235aec (diff) | |
| download | gitlab-ce-c350f3ccd8e72d2e655210c74e508e7720763eb7.tar.gz | |
Merge branch '50904-remove-icon-env' into 'master'
Removes icon key from job endpoint
See merge request gitlab-org/gitlab-ce!22085
| -rw-r--r-- | app/serializers/build_details_entity.rb | 8 | ||||
| -rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/job/deployment_status.json | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index c85b1790e73..3d508a9a407 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class BuildDetailsEntity < JobEntity - include EnvironmentHelper - include RequestAwareEntity - include CiStatusHelper - expose :coverage, :erased_at, :duration expose :tag_list, as: :tags expose :has_trace?, as: :has_trace @@ -15,10 +11,6 @@ class BuildDetailsEntity < JobEntity expose :deployment_status, if: -> (*) { build.has_environment? } do expose :deployment_status, as: :status - expose :icon do |build| - ci_label_for_status(build.status) - end - expose :persisted_environment, as: :environment, with: EnvironmentEntity end diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index fd11cb31a2a..30a418c0e88 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -225,7 +225,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do expect(response).to have_gitlab_http_status(:ok) expect(json_response).to match_schema('job/job_details') expect(json_response['deployment_status']["status"]).to eq 'creating' - expect(json_response['deployment_status']["icon"]).to eq 'passed' expect(json_response['deployment_status']["environment"]).not_to be_nil end end diff --git a/spec/fixtures/api/schemas/job/deployment_status.json b/spec/fixtures/api/schemas/job/deployment_status.json index a90b8b35654..83b1899fdf3 100644 --- a/spec/fixtures/api/schemas/job/deployment_status.json +++ b/spec/fixtures/api/schemas/job/deployment_status.json @@ -2,7 +2,6 @@ "type": "object", "required": [ "status", - "icon", "environment" ], "properties": { @@ -20,7 +19,6 @@ { "type": "null" } ] }, - "icon": { "type": "string" }, "environment": { "$ref": "../environment.json" } }, "additionalProperties": false |