Respond with "success" when requesting "sample" (roomorama test reque…

…sts)

Return proper 404 response when 404

apps/api/config/environment_variables.yml

@@ -1,3 +1,4 @@
+- ROOMORAMA_SECRET_AUDIT
 - ROOMORAMA_SECRET_JTB
 - ROOMORAMA_SECRET_KIGO_LEGACY
 - ROOMORAMA_SECRET_KIGO

lib/concierge/suppliers/audit/server.rb

@@ -14,28 +14,37 @@ def initialize(app)
 
     def call(env)
       status, headers, body = @app.call(env)
-      status, headers, body = handle_404(env) if status == 404
+      status, headers, body = handle_404(env) || [status, headers, body] if status == 404
 
       if File.basename(env['PATH_INFO']) =~ /booking/
-        [status, headers, [replace_response_body(body)]]
+        new_body = replace_response_body(body)
+        [status, headers.merge('Content-Length' => new_body.length.to_s), [new_body]]
       else
         [status, headers, body]
       end
     end
 
     private
 
+    def retry_with(env, old_string, new_string)
+      @app.call(env.merge({
+        'PATH_INFO' => env['PATH_INFO'].gsub(old_string, new_string),
+        'REQUEST_PATH' => env['REQUEST_PATH'] && env['REQUEST_PATH'].gsub(old_string, new_string),
+      }))
+    end
+
     def handle_404(env)
       case File.basename(env['PATH_INFO'])
+      when /sample/
+        # sample = success
+        retry_with(env, 'sample', 'success')
+
       when /connection_timeout/
         # First we wait
         sleep Concierge::HTTPClient::CONNECTION_TIMEOUT + 1
 
         # Then we return the requested info (Concierge::HTTPClient should have errored out by now)
-        @app.call(env.merge({
-          'PATH_INFO' => env['PATH_INFO'].gsub('connection_timeout', 'success'),
-          'REQUEST_PATH' => env['REQUEST_PATH'] && env['REQUEST_PATH'].gsub('connection_timeout', 'success'),
-        }))
+        retry_with(env, 'connection_timeout', 'success')
 
       when /wrong_json/
         [200, {}, ["[1, 2, 3]"]]

spec/lib/concierge/suppliers/audit/server_spec.rb

@@ -16,6 +16,16 @@
     expect(response_body_as_string(response)).to eq(IO.read file)
   end
 
+  it "serves sample requests as success" do
+    file = %w[
+      spec/fixtures/audit/cancel.success.json
+      spec/fixtures/audit/quotation.success.json
+    ].sample
+    code, env, response = middleware.call Rack::MockRequest.env_for("http://admin.example.com/#{file.gsub("success", "sample")}", {})
+    expect(code).to eq(200)
+    expect(response_body_as_string(response)).to eq(IO.read file)
+  end
+
   it "serves connection_timeout with correct content but after CONNECTION_TIMEOUT seconds delay" do
     # we could do a start/end check.. but that'll make test slower
     expect(middleware).to receive(:sleep).with(Concierge::HTTPClient::CONNECTION_TIMEOUT + 1).and_return(nil)
@@ -53,6 +63,12 @@
     expect(response_body_as_string(response)).to eq("{")
   end
 
+  it "serves unknown as 404" do
+    file = Dir["spec/fixtures/audit/*.success.json"].sample.gsub("success", "unknown")
+    code, env, response = middleware.call Rack::MockRequest.env_for("http://admin.example.com/#{file}", {})
+    expect(code).to eq(404)
+  end
+
   def result_without_key(hash, key)
     hash['result'].delete(key)
     hash