From 8012a4a0d8ac597fbbdc3819bb6a50922361b77f Mon Sep 17 00:00:00 2001
From: Andrew Jones <ajones@digitalbazaar.com>
Date: Mon, 29 Jul 2024 10:31:01 -0400
Subject: [PATCH] Clean up various negative context tests & add FIXMEs for
 docLoader issues.

---
 test/10-verify.spec.js | 73 +++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/test/10-verify.spec.js b/test/10-verify.spec.js
index e0761f97..3561e394 100644
--- a/test/10-verify.spec.js
+++ b/test/10-verify.spec.js
@@ -35,7 +35,6 @@ function _runSuite({
     ['/issuer', '/issuanceDate'] : ['/issuer'];
   const selectivePointers = ['/credentialSubject'];
   const generateDefaults = {
-    credentialFactory,
     suites,
     issuer: keyDoc.controller,
     mandatoryPointers,
@@ -127,77 +126,107 @@ function _runSuite({
 
       describe('negative test', async () => {
         it('fails to verify if a context resolves to null', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push(invalidContexts.nullDoc.url);
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          //one with the context resolving to a valid context and the
+          //other with a context resolving to null
+          verifiableCredential['@context'].push(invalidContexts.nullDoc.url);
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context contains an invalid id', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push(invalidContexts.invalidId.url);
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          verifiableCredential['@context'].push(invalidContexts.invalidId.url);
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context has a null version', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push(invalidContexts.nullVersion.url);
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          verifiableCredential['@context'].push(
+            invalidContexts.nullVersion.url);
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context has a null @id', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push(invalidContexts.nullId.url);
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          verifiableCredential['@context'].push(invalidContexts.nullId.url);
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context has a null @type', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push(invalidContexts.nullType.url);
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          verifiableCredential['@context'].push(invalidContexts.nullType.url);
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context links to a missing doc', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push('https://fsad.digitalbazaar.com');
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          //FIXME this should be handled with 2 different document loaders
+          verifiableCredential['@context'].push('https://fsad.digitalbazaar.com');
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');
           results.verified.should.be.false;
         });
         it('fails to verify if a context has an invalid url', async () => {
-          const {credential} = await signCredential(generateDefaults);
-          credential['@context'].push('htps://fsad.digitalbazaar.');
+          const {verifiableCredential} = await signCredential({
+            credential: credentialFactory(),
+            ...generateDefaults
+          });
+          verifiableCredential['@context'].push('htps://fsad.digitalbazaar.');
           const results = await vc.verifyCredential({
             suite: verifySuite,
-            credential,
+            credential: verifiableCredential,
             documentLoader
           });
           results.verified.should.be.a('boolean');