Merge branch 'master' into live-trace-v2

3 files changed, 7 insertions, 7 deletions

diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index 3ffdfdc0e9a..0a2963452e4 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -281,7 +281,7 @@ describe API::Jobs do
           get_artifact_file(artifact)
 
           expect(response).to have_gitlab_http_status(200)
-          expect(response.headers)
+          expect(response.headers.to_h)
             .to include('Content-Type' => 'application/json',
                         'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
         end
@@ -311,7 +311,7 @@ describe API::Jobs do
 
       it 'returns specific job artifacts' do
         expect(response).to have_gitlab_http_status(200)
-        expect(response.headers).to include(download_headers)
+        expect(response.headers.to_h).to include(download_headers)
         expect(response.body).to match_file(job.artifacts_file.file.file)
       end
     end
@@ -462,7 +462,7 @@ describe API::Jobs do
           end
 
           it { expect(response).to have_http_status(:ok) }
-          it { expect(response.headers).to include(download_headers) }
+          it { expect(response.headers.to_h).to include(download_headers) }
         end
 
         context 'when artifacts are stored remotely' do
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index d9c33a7b8ab..f27c95b4907 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -1355,7 +1355,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
               it 'download artifacts' do
                 expect(response).to have_http_status(200)
-                expect(response.headers).to include download_headers
+                expect(response.headers.to_h).to include download_headers
               end
             end
 
@@ -1370,7 +1370,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
                 it 'uses workhorse send-url' do
                   expect(response).to have_gitlab_http_status(200)
-                  expect(response.headers).to include(
+                  expect(response.headers.to_h).to include(
                     'Gitlab-Workhorse-Send-Data' => /send-url:/)
                 end
               end
diff --git a/spec/requests/api/v3/builds_spec.rb b/spec/requests/api/v3/builds_spec.rb
index 00f067889a0..485d7c2cc43 100644
--- a/spec/requests/api/v3/builds_spec.rb
+++ b/spec/requests/api/v3/builds_spec.rb
@@ -232,7 +232,7 @@ describe API::V3::Builds do
 
           it 'returns specific job artifacts' do
             expect(response).to have_http_status(200)
-            expect(response.headers).to include(download_headers)
+            expect(response.headers.to_h).to include(download_headers)
             expect(response.body).to match_file(build.artifacts_file.file.file)
           end
         end
@@ -332,7 +332,7 @@ describe API::V3::Builds do
           end
 
           it { expect(response).to have_http_status(200) }
-          it { expect(response.headers).to include(download_headers) }
+          it { expect(response.headers.to_h).to include(download_headers) }
         end
 
         context 'when artifacts are stored remotely' do