test: tighten feed response smoke coverage

Author: gildesmarais

spec/html2rss/web/feeds/responder_spec.rb

@@ -60,10 +60,12 @@ def resolved_source
       expect(response_tuple(write_response)).to eq([200, 'application/xml', '<rss/>'])
     end
 
-    it 'marks the response as cacheable' do
+    it 'marks the response as cacheable', :aggregate_failures do
       write_response
 
+      expect(response['Cache-Control']).to include('max-age=600')
       expect(response['Cache-Control']).to include('public')
+      expect(response['Vary']).to eq('Accept')
     end
 
     it 'emits success after writing the response' do
@@ -112,10 +114,11 @@ def resolved_source
       expect(response_tuple(write_response)).to eq([500, 'application/feed+json', '{"title":"Error"}'])
     end
 
-    it 'marks the response as non-cacheable' do
+    it 'marks the response as non-cacheable', :aggregate_failures do
       write_response
 
       expect(response['Cache-Control']).to include('no-store')
+      expect(response['Vary']).to eq('Accept')
     end
   end
 

spec/smoke/docker_spec.rb

@@ -16,6 +16,13 @@ def get_json(path, headers: {})
     perform_request(uri, request)
   end
 
+  def get_response(path, headers: {})
+    uri = URI.join(base_url, path)
+    request = Net::HTTP::Get.new(uri, headers)
+    response = Net::HTTP.start(uri.host, uri.port) { |http| http.request(request) }
+    [response, response.body.to_s]
+  end
+
   def post_json(path, body:, headers: {})
     uri = URI.join(base_url, path)
     request = Net::HTTP::Post.new(uri, headers.merge('Content-Type' => 'application/json'))
@@ -28,6 +35,18 @@ def perform_request(uri, request)
     [response, response.body.to_s.empty? ? {} : JSON.parse(response.body)]
   end
 
+  def expect_created_feed_response(body)
+    expect(body.fetch('success')).to be(true)
+    expect(body.dig('data', 'feed', 'public_url')).to match(%r{^/api/v1/feeds/})
+    expect(body.dig('data', 'feed', 'json_public_url')).to match(%r{^/api/v1/feeds/.+\.json$})
+  end
+
+  def expect_json_feed_response(path)
+    feed_response, = get_response(path, headers: { 'Accept' => 'application/feed+json' })
+    expect(feed_response['Content-Type']).to include('application/feed+json')
+    expect(feed_response.code).not_to eq('401')
+  end
+
   it 'exposes health endpoints without authentication requirements', :aggregate_failures do
     response, payload = get_json('/api/v1/health/ready')
     expect(response).to be_a(Net::HTTPOK)
@@ -72,9 +91,8 @@ def perform_request(uri, request)
                                headers: { 'Authorization' => "Bearer #{feed_token}" })
 
     expect(response.code).to eq('201')
-    expect(body.fetch('success')).to be(true)
-    expect(body.dig('data', 'feed', 'public_url')).to match(%r{^/api/v1/feeds/})
-    expect(body.dig('data', 'feed', 'json_public_url')).to match(%r{^/api/v1/feeds/.+\.json$})
+    expect_created_feed_response(body)
+    expect_json_feed_response(body.dig('data', 'feed', 'json_public_url'))
   end
 
   it 'returns forbidden for authenticated creation when auto source is disabled', :aggregate_failures do