diff options
author | Robert Speicher <robert@gitlab.com> | 2018-05-11 16:43:46 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-05-11 16:43:46 +0000 |
commit | da49a357da7926f1ce14edb5a0a4dcc9be751080 (patch) | |
tree | c0a7ace7f55cd60d9f9f672056e9f3e544d20c7b | |
parent | f4e234d92a2ff31dc681d56b52e9fbbbe3f931b1 (diff) | |
parent | ba1e8f822a1c45e22a7085343c50e3d8a8fd97f9 (diff) | |
download | gitlab-ce-da49a357da7926f1ce14edb5a0a4dcc9be751080.tar.gz |
Merge branch 'b-rails5-fix-spec-controllers-projects-jobs_controller_spec-rb' into 'master'
Resolve "[Rails5] Fix spec/controllers/projects/jobs_controller_spec.rb"
Closes #46227
See merge request gitlab-org/gitlab-ce!18891
-rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 2281cb420d9..a08fcea27a5 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -490,43 +490,43 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do id: job.id end - context 'when job has a trace artifact' do + context "when job has a trace artifact" do let(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) } it 'returns a trace' do response = subject expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'text/plain; charset=utf-8' - expect(response.body).to eq job.job_artifacts_trace.open.read + expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8") + expect(response.body).to eq(job.job_artifacts_trace.open.read) end end - context 'when job has a trace file' do + context "when job has a trace file" do let(:job) { create(:ci_build, :trace_live, pipeline: pipeline) } - it 'send a trace file' do + it "send a trace file" do response = subject expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'text/plain; charset=utf-8' - expect(response.body).to eq 'BUILD TRACE' + expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8") + expect(response.body).to eq("BUILD TRACE") end end - context 'when job has a trace in database' do + context "when job has a trace in database" do let(:job) { create(:ci_build, pipeline: pipeline) } before do - job.update_column(:trace, 'Sample trace') + job.update_column(:trace, "Sample trace") end - it 'send a trace file' do + it "send a trace file" do response = subject expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'text/plain; charset=utf-8' - expect(response.body).to eq 'Sample trace' + expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8") + expect(response.body).to eq("Sample trace") end end |