match on full url

Author: lobsterkatie

packages/nextjs/test/integration/test/server/errorApiEndpoint.js

@@ -3,7 +3,9 @@ const assert = require('assert');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptEventRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/api/error`;
+
   const capturedRequest = interceptEventRequest(
     {
       exception: {
@@ -18,15 +20,15 @@ module.exports = async ({ url, argv }) => {
         runtime: 'node',
       },
       request: {
-        url: `${url}/api/error`,
+        url,
         method: 'GET',
       },
       transaction: 'GET /api/error',
     },
     argv,
   );
 
-  await getAsync(`${url}/api/error`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');

packages/nextjs/test/integration/test/server/errorServerSideProps.js

@@ -3,7 +3,9 @@ const assert = require('assert');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptEventRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/withServerSideProps`;
+
   const capturedRequest = interceptEventRequest(
     {
       exception: {
@@ -18,14 +20,14 @@ module.exports = async ({ url, argv }) => {
         runtime: 'node',
       },
       request: {
-        url: '/withServerSideProps',
+        url,
         method: 'GET',
       },
     },
     argv,
   );
 
-  await getAsync(`${url}/withServerSideProps`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');

packages/nextjs/test/integration/test/server/tracing200.js

@@ -3,7 +3,9 @@ const assert = require('assert');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptTracingRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/api/users`;
+
   const capturedRequest = interceptTracingRequest(
     {
       contexts: {
@@ -16,13 +18,13 @@ module.exports = async ({ url, argv }) => {
       transaction: 'GET /api/users',
       type: 'transaction',
       request: {
-        url: '/api/users',
+        url,
       },
     },
     argv,
   );
 
-  await getAsync(`${url}/api/users`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');

packages/nextjs/test/integration/test/server/tracing404.js

@@ -3,7 +3,8 @@ const assert = require('assert');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptTracingRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/api/missing`;
   const capturedRequest = interceptTracingRequest(
     {
       contexts: {
@@ -16,13 +17,13 @@ module.exports = async ({ url, argv }) => {
       transaction: 'GET /404',
       type: 'transaction',
       request: {
-        url: '/api/missing',
+        url,
       },
     },
     argv,
   );
 
-  await getAsync(`${url}/api/missing`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');

packages/nextjs/test/integration/test/server/tracing500.js

@@ -3,7 +3,8 @@ const assert = require('assert');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptTracingRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/api/broken`;
   const capturedRequest = interceptTracingRequest(
     {
       contexts: {
@@ -16,13 +17,13 @@ module.exports = async ({ url, argv }) => {
       transaction: 'GET /api/broken',
       type: 'transaction',
       request: {
-        url: '/api/broken',
+        url,
       },
     },
     argv,
   );
 
-  await getAsync(`${url}/api/broken`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');

packages/nextjs/test/integration/test/server/tracingHttp.js

@@ -5,7 +5,9 @@ const nock = require('nock');
 const { sleep } = require('../utils/common');
 const { getAsync, interceptTracingRequest } = require('../utils/server');
 
-module.exports = async ({ url, argv }) => {
+module.exports = async ({ url: urlBase, argv }) => {
+  const url = `${urlBase}/api/http`;
+
   nock('http://example.com')
     .get('/')
     .reply(200, 'ok');
@@ -30,13 +32,13 @@ module.exports = async ({ url, argv }) => {
       transaction: 'GET /api/http',
       type: 'transaction',
       request: {
-        url: '/api/http',
+        url,
       },
     },
     argv,
   );
 
-  await getAsync(`${url}/api/http`);
+  await getAsync(url);
   await sleep(100);
 
   assert.ok(capturedRequest.isDone(), 'Did not intercept expected request');