chore(test): remove nock.orgConfig in handlers that have org/site

Author: dominique-pfister

test/auth/authenticate.test.js

@@ -77,7 +77,6 @@ describe('Authentication Test', () => {
 
   describe('`getAuthInfo`', () => {
     beforeEach(() => {
-      nock.orgConfig().reply(404);
       nock.siteConfig(SITE_CONFIG);
     });
 
@@ -518,7 +517,6 @@ describe('Authentication Test', () => {
 
   describe('Site API Token', () => {
     async function testApiToken(sub, jti, apiKeyId, audience = ADMIN_CLIENT_ID) {
-      nock.orgConfig().reply(404);
       nock.siteConfig({
         ...SITE_CONFIG,
         access: {
@@ -1019,7 +1017,6 @@ describe('IMS Authentication Test', () => {
     nock = new Nock().env();
 
     nock.siteConfig(SITE_CONFIG);
-    nock.orgConfig().reply(404);
   });
 
   afterEach(() => {

test/cache/handler.test.js

@@ -16,7 +16,7 @@ import { Request, Response } from '@adobe/fetch';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import purge from '../../src/cache/purge.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 describe('Cache Handler Tests', () => {
   /** @type {import('../utils.js').NockEnv} */
@@ -30,7 +30,6 @@ describe('Cache Handler Tests', () => {
     sandbox = sinon.createSandbox();
 
     nock.siteConfig(SITE_CONFIG);
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/google-file.test.js

@@ -19,7 +19,7 @@ import { Request } from '@adobe/fetch';
 import { GoogleClient } from '@adobe/helix-google-support';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 const TEST_BYTES = randomBytes(8192);
 
@@ -30,8 +30,6 @@ describe('Google File Tests', () => {
   beforeEach(() => {
     nock = new Nock().env();
     GoogleClient.setItemCacheOptions({ max: 1000 });
-
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/google-json.test.js

@@ -19,7 +19,7 @@ import { GoogleClient } from '@adobe/helix-google-support';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { sanitizeHtml } from '../../src/contentproxy/google-json.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 import { getFormattedCellsSheet } from './fixtures/formatted-cells-sheet.js';
 import { getFormattedCellsValues } from './fixtures/formatted-cells-values.js';
 import TEST_STRUCTURES_VALUES from './fixtures/structure-values.js';
@@ -34,7 +34,6 @@ describe('Google JSON Tests', () => {
     GoogleClient.setItemCacheOptions({ max: 1000 });
 
     nock.siteConfig(SITE_CONFIG);
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/google.test.js

@@ -16,7 +16,7 @@ import { Request } from '@adobe/fetch';
 import { GoogleClient } from '@adobe/helix-google-support';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 describe('Google Integration Tests', () => {
   /** @type {import('../utils.js').NockEnv} */
@@ -27,7 +27,6 @@ describe('Google Integration Tests', () => {
     GoogleClient.setItemCacheOptions({ max: 1000 });
 
     nock.siteConfig(SITE_CONFIG);
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/handler.test.js

@@ -14,16 +14,14 @@ import assert from 'assert';
 import { Request } from '@adobe/fetch';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 describe('ContentProxy Handler Tests', () => {
   /** @type {import('../utils.js').NockEnv} */
   let nock;
 
   beforeEach(() => {
     nock = new Nock().env();
-
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/markup-file.test.js

@@ -18,7 +18,7 @@ import { resolve } from 'path';
 import { Request } from '@adobe/fetch';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 const mountpointUrl = 'https://www.example.com';
 
@@ -40,8 +40,6 @@ describe('Markup File Tests', () => {
 
   beforeEach(() => {
     nock = new Nock().env();
-
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/markup-json.test.js

@@ -15,7 +15,7 @@ import assert from 'assert';
 import { Request } from '@adobe/fetch';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 import { validSheet } from './utils.js';
 
 const mountpointUrl = 'https://www.example.com';
@@ -38,8 +38,6 @@ describe('Markup Integration Tests (JSON)', () => {
 
   beforeEach(() => {
     nock = new Nock().env();
-
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/markup.test.js

@@ -17,7 +17,7 @@ import { promisify } from 'util';
 import { Request } from '@adobe/fetch';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 const gunzipAsync = promisify(gunzip);
 
@@ -51,8 +51,6 @@ describe('Markup Integration Tests', () => {
 
   beforeEach(() => {
     nock = new Nock().env();
-
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {

test/contentproxy/onedrive-file.test.js

@@ -17,7 +17,7 @@ import { Request } from '@adobe/fetch';
 import { AcquireMethod, OneDrive } from '@adobe/helix-onedrive-support';
 import { AuthInfo } from '../../src/auth/auth-info.js';
 import { main } from '../../src/index.js';
-import { Nock, SITE_CONFIG, ORG_CONFIG } from '../utils.js';
+import { Nock, SITE_CONFIG } from '../utils.js';
 
 const SITE_1D_CONFIG = {
   ...SITE_CONFIG,
@@ -44,7 +44,6 @@ describe('OneDrive Integration Tests (file)', () => {
     nock = new Nock().env();
 
     nock.siteConfig(SITE_1D_CONFIG);
-    nock.orgConfig(ORG_CONFIG);
   });
 
   afterEach(() => {