Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-04-22 18:42:44 +0300
committerMayra Cabrera <mcabrera@gitlab.com>2018-04-22 18:55:17 +0300
commit3327bf6247c9f99d373a31b10edbb3f6c0b868df (patch)
treeb4fb19e816400670357c59f4fab55bfb41af5658 /spec/controllers
parent3c3cab8b329ce83ae7d1c669a6933dcb16fcd552 (diff)
Removes 'no job log' from trace action
'No job log' message is no longer necessary since we returned an image when a build does not have a trace. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more details Closes #45625
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/jobs_controller_spec.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index f677cec3408..b9a979044fe 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -190,10 +190,7 @@ describe Projects::JobsController do
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['id']).to eq job.id
expect(json_response['status']).to eq job.status
- end
-
- it 'returns no job log message' do
- expect(json_response['html']).to eq('No job log')
+ expect(json_response['html']).to be_nil
end
end