mm-apmspii-526: add in test for no content location

Author: matt-mercer

docker/async-slowapp/src/handlers.js

@@ -221,6 +221,8 @@ async function slow(req, res, next) {
 
     let delay = req.query.delay;
 
+    let nocl = req.query.nocl;
+
     if (delay !== undefined) {
         delay = parseFloat(delay);
         await sleep(delay*1000);
@@ -237,6 +239,10 @@ async function slow(req, res, next) {
 
     let location = `${locals.base_uri}/poll?id=${poll_id}`;
 
+    if (nocl === '1') {
+        location = `${location}&nocl=1`;
+    }
+
     let headers = new MultiValueHeaders([
         "Content-Type", "application/json",
         "Content-Location", location
@@ -262,18 +268,19 @@ async function delete_poll(req, res, next) {
     respond(req, res, next, 200);
 }
 
-let poll_counter = 0;
+
 async function poll(req, res, next) {
 
     let poll_id = req.query.id;
+    let nocl = req.query.nocl;
     let headers = req.rawHeaders.asMultiValue();
     let cookies = headers.cookies('cookie');
     let locals = req.app.locals;
 
     let poll_count = cookies['poll-count'];
 
     if (poll_count !== undefined) {
-        poll_counter++
+        poll_count = (parseInt(poll_count.split('=')[1]) + 1).toString();
     }
 
     if (!(poll_id in locals.tracked)) {
@@ -283,17 +290,25 @@ async function poll(req, res, next) {
 
     let tracking = locals.tracked[poll_id];
 
-    if (new Date() < tracking.finish_at) {
-        respond(req, res, next, 202, new MultiValueHeaders(['Content-Location', `${locals.base_uri}/poll?id=${poll_id}`]));
-        return;
-    }
 
     let resp_headers = new MultiValueHeaders();
 
     if (poll_count !== undefined) {
-        resp_headers.withNewCookies({"poll-count": `poll-count=${poll_counter}`}, 'set-cookie');
+        resp_headers.withNewCookies({"poll-count": `poll-count=${poll_count}`}, 'set-cookie');
+    }
+
+
+    if (new Date() < tracking.finish_at) {
+
+        if (nocl !== '1') {
+            resp_headers.set('Content-Location', `${locals.base_uri}/poll?id=${poll_id}`)
+        }
+        respond(req, res, next, 202, resp_headers);
+        return;
     }
 
+
+
     delete locals.tracked[poll_id];
 
     respond(req, res, next, tracking.final_status, resp_headers);

docker/sync-wrap/src/app.slowapp.spec.js

@@ -144,7 +144,21 @@ describe("express with slowap", function () {
                 assert.isAbove(pollCount, 1);
                 done();
             })
-    }).timeout(10000)
+    }).timeout(10000);
+
+
+    it("GET /slow?nocl=1, don't set content location on poll", (done) => {
+        request(server)
+            .get(`/slow?final_status=200&complete_in=3&nocl=1`)
+            .set("x-sync-wait", "5")
+            .expect(200)
+            .then(({ headers }) => {
+                const pollCount = parseInt(headers["set-cookie"][0].split("=")[1]);
+                assert.isAbove(pollCount, 1);
+                done();
+            })
+    }).timeout(10000);
+
 });
 
 

docker/sync-wrap/src/handlers.js

@@ -472,6 +472,10 @@ async function proxy(req, res, next) {
                 let response = outcome.response;
                 let headers = outcome.headers.withPreviousCookies(outcome.options.received_cookies);
                 if (outcome.response.statusCode === 202) {
+                    if (headers.has('content-location')) {
+                        let poll_location = new URL(headers.get("content-location"));
+                        outcome.options.path = poll_location.pathname + poll_location.search;
+                    }
                     outcome.options.last_response = response;
                     outcome.options.last_headers = headers;
                     outcome.options.received_cookies = headers.cookies("set-cookie");
@@ -514,7 +518,7 @@ async function proxy(req, res, next) {
             await send_response(response.statusCode, {headers: headers, response: response});
         })
         .catch(async (fin) => {
-            await send_response(fin.error === "timeout" ? 504 : 502, {headers: headers, error: fin.error || error});
+            await send_response(fin.error === "timeout" ? 504 : 502, {headers: headers, error: fin.error || fin});
         });
 
 }