From 3e606a6c7957f98ad0c981b9e17a1fbd331c82fb Mon Sep 17 00:00:00 2001
From: dtfiedler <dylan@ar.io>
Date: Thu, 12 Sep 2024 19:48:10 -0600
Subject: [PATCH] chore(test): add e2e test for resolver routes

---
 src/routes/arns.ts           | 13 ++++++-------
 test/end-to-end/arns.test.ts | 22 ++++++----------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/routes/arns.ts b/src/routes/arns.ts
index 5fc0c3db..d72e7b07 100644
--- a/src/routes/arns.ts
+++ b/src/routes/arns.ts
@@ -24,6 +24,7 @@ import * as system from '../system.js';
 import { dataHandler } from './data/index.js';
 import { headerNames } from '../constants.js';
 import { sendNotFound } from './data/handlers.js';
+import { DEFAULT_ARNS_TTL_SECONDS } from '../resolution/trusted-gateway-arns-resolver.js';
 
 export const arnsRouter = Router();
 
@@ -53,18 +54,16 @@ arnsRouter.get('/ar-io/resolver/:name', async (req, res) => {
 
   const { resolvedId, ttl, processId, resolvedAt } = resolved;
 
-  // check if they are undefined
-  if (
-    resolvedId === undefined ||
-    ttl === undefined ||
-    processId === undefined
-  ) {
+  if (resolvedId === undefined) {
     sendNotFound(res);
     return;
   }
 
   res.header(headerNames.arnsResolvedId, resolvedId);
-  res.header(headerNames.arnsTtlSeconds, ttl.toString());
+  res.header(
+    headerNames.arnsTtlSeconds,
+    ttl.toString() || DEFAULT_ARNS_TTL_SECONDS.toString(),
+  );
   res.header(headerNames.arnsProcessId, processId);
 
   // add arns headers
diff --git a/test/end-to-end/arns.test.ts b/test/end-to-end/arns.test.ts
index bdc5b6d8..9bd38015 100644
--- a/test/end-to-end/arns.test.ts
+++ b/test/end-to-end/arns.test.ts
@@ -113,13 +113,8 @@ describe('ArNS', function () {
 
   // verify the /ar-io/resolver/:name endpoint
   it('Verifying that /ar-io/resolver/:name returns 200 and resolution data', async function () {
-    const txId = 'TB2wJyKrPnkAW79DAwlJYwpgdHKpijEJWQfcwX715Co';
-    const res = await axios.get(
-      'http://localhost:4000/ar-io/resolver/ardrive',
-      {
-        headers: { Host: 'ardrive.ar-io.localhost' },
-      },
-    );
+    const txId = '7czHwMqgYHC3eJrPagyFA03UT4YXIN1um__tpHUXAHE';
+    const res = await axios.get('http://localhost:4000/ar-io/resolver/ardrive');
 
     assert.strictEqual(res.status, 200);
     assert.strictEqual(res.data.txId, txId);
@@ -129,15 +124,10 @@ describe('ArNS', function () {
 
   // verify the headers are set correctly on the response
   it('Verifying that /ar-io/resolver/:name returns 200 and sets the correct headers', async function () {
-    const txId = 'TB2wJyKrPnkAW79DAwlJYwpgdHKpijEJWQfcwX715Co';
-    const res = await axios.get(
-      'http://localhost:4000/ar-io/resolver/ardrive',
-      {
-        headers: { Host: 'ardrive.ar-io.localhost' },
-      },
-    );
+    const txId = '7czHwMqgYHC3eJrPagyFA03UT4YXIN1um__tpHUXAHE';
+    const res = await axios.get('http://localhost:4000/ar-io/resolver/ardrive');
 
-    assert.strictEqual(typeof res.headers['x-arns-resolved-id'], txId);
+    assert.strictEqual(res.headers['x-arns-resolved-id'], txId);
     assert.strictEqual(typeof res.headers['x-arns-ttl-seconds'], 'string');
     assert.strictEqual(typeof res.headers['x-arns-process-id'], 'string');
   });
@@ -146,7 +136,7 @@ describe('ArNS', function () {
     const res = await axios.get(
       'http://localhost:4000/ar-io/resolver/nonexistent',
       {
-        headers: { Host: 'ardrive.ar-io.localhost' },
+        validateStatus: (status) => status === 404, // only accept 404 status
       },
     );