Fix uses of ActionController::TestResponse in specs

This class has moved / changed slightly.
openfoodfoundation · Jan 9, 2021 · c725d4e · c725d4e
1 parent 8309b97
commit c725d4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...c/services/order_management/reports/enterprise_fee_summary/renderers/csv_renderer_spec.rb b/...c/services/order_management/reports/enterprise_fee_summary/renderers/csv_renderer_spec.rb
@@ -12,7 +12,7 @@
 
   # Context which will be passed to the renderer. The response object is not automatically prepared,
   # so this has to be assigned explicitly.
-  let!(:response) { ActionController::TestResponse.new }
+  let!(:response) { ActionDispatch::TestResponse.new }
   let!(:controller) do
     ActionController::Base.new.tap do |controller_mock|
       controller_mock.instance_variable_set(:@_response, response)

diff --git a/spec/services/embedded_page_service_spec.rb b/spec/services/embedded_page_service_spec.rb
@@ -6,8 +6,8 @@
   let(:enterprise_slug) { 'test-enterprise' }
   let(:params) { { controller: 'enterprises', action: 'shop', id: enterprise_slug, embedded_shopfront: true } }
   let(:session) { {} }
-  let(:request) { ActionController::TestRequest.new('HTTP_HOST' => 'ofn-instance.com', 'HTTP_REFERER' => 'https://embedding-enterprise.com') }
-  let(:response) { ActionController::TestResponse.new(200, 'X-Frame-Options' => 'DENY', 'Content-Security-Policy' => "frame-ancestors 'none'") }
+  let(:request) { ActionController::TestRequest.new({'HTTP_HOST' => 'ofn-instance.com', 'HTTP_REFERER' => 'https://embedding-enterprise.com'}, nil) }
+  let(:response) { ActionDispatch::TestResponse.new(200, 'X-Frame-Options' => 'DENY', 'Content-Security-Policy' => "frame-ancestors 'none'") }
   let(:service) { EmbeddedPageService.new(params, session, request, response) }
 
   before do
@@ -23,7 +23,7 @@
 
       it "sets the response headers to enables embedding requests from the embedding site" do
         expect(response.headers).to_not include 'X-Frame-Options' => 'DENY'
-        expect(response.headers).to include 'Content-Security-Policy' => "frame-ancestors 'self' embedding-enterprise.com"
+        expect(response.headers).to eq 'Content-Security-Policy' => "frame-ancestors 'self' embedding-enterprise.com"
       end
 
       it "sets session variables" do
@@ -63,7 +63,7 @@
     end
 
     context "when the request's referer is malformed" do
-      let(:request) { ActionController::TestRequest.new('HTTP_HOST' => 'ofn-instance.com', 'HTTP_REFERER' => 'hello') }
+      let(:request) { ActionController::TestRequest.new({'HTTP_HOST' => 'ofn-instance.com', 'HTTP_REFERER' => 'hello'}, nil) }
       before do
         service.embed!
       end