Remove reference to PodBrowser in tests and clean up ESS1.1 artefacts

Author: edwardsph

src/resource/__snapshots__/solidDataset.test.ts.snap

@@ -57,51 +57,7 @@ exports[`getSolidDataset returns a SolidDataset representing the fetched Turtle
 }
 `;
 
-exports[`getWellKnownSolid returns the contents of .well-known/solid for the given resource (1.1) 1`] = `
-{
-  "graphs": {
-    "default": {
-      "_:b0": {
-        "predicates": {
-          "http://inrupt.com/ns/ess#consentIssuer": {
-            "namedNodes": [
-              "https://consent.pod.inrupt.com",
-            ],
-          },
-          "http://inrupt.com/ns/ess#notificationGatewayEndpoint": {
-            "namedNodes": [
-              "https://notification.pod.inrupt.com",
-            ],
-          },
-          "http://inrupt.com/ns/ess#powerSwitchEndpoint": {
-            "namedNodes": [
-              "https://pod.inrupt.com/powerswitch/username",
-            ],
-          },
-          "http://www.w3.org/ns/pim/space#storage": {
-            "namedNodes": [
-              "https://pod.inrupt.com/username/",
-            ],
-          },
-        },
-        "type": "Subject",
-        "url": "_:b0",
-      },
-    },
-  },
-  "internal_resourceInfo": {
-    "contentLocation": undefined,
-    "contentType": "application/ld+json",
-    "isRawData": false,
-    "linkedResources": {},
-    "location": undefined,
-    "sourceIri": "https://example.org/pod/.well-known/solid",
-  },
-  "type": "Dataset",
-}
-`;
-
-exports[`getWellKnownSolid returns the contents of .well-known/solid for the given resource (2.0) 1`] = `
+exports[`getWellKnownSolid returns the contents of .well-known/solid for the given resource 1`] = `
 {
   "graphs": {
     "default": {
@@ -114,7 +70,7 @@ exports[`getWellKnownSolid returns the contents of .well-known/solid for the giv
           },
           "http://www.w3.org/ns/auth/acl#trustedApp": {
             "namedNodes": [
-              "https://podbrowser.inrupt.com/api/app",
+              "https://inrupt.com",
             ],
           },
           "http://www.w3.org/ns/solid/terms#maxPodsPerOwner": {

src/resource/solidDataset.test.ts

@@ -3338,14 +3338,14 @@ describe("getWellKnownSolid", () => {
   const resourceUrl = "https://example.org/pod/resource";
   const wellKnownSolid = ".well-known/solid";
 
-  const ess20Implementation: typeof fetch = async () =>
+  const essDiscoveryDoc: typeof fetch = async () =>
     new Response(
       `@prefix solid: <http://www.w3.org/ns/solid/terms#> .
 
 [
     a solid:DiscoveryDocument ;
     <http://www.w3.org/ns/auth/acl#trustedApp>
-            <https://podbrowser.inrupt.com/api/app> ;
+            <https://inrupt.com> ;
     solid:maxPodsPerOwner      10 ;
     solid:notificationGateway  <https://notification.inrupt.com/> ;
     solid:provision            <https://provision.inrupt.com/> ;
@@ -3358,56 +3358,12 @@ describe("getWellKnownSolid", () => {
       },
     );
 
-  const ess11Implementation: typeof fetch = async (
-    url: RequestInfo | URL,
-    init?: RequestInit,
-  ) => {
-    if (url === "https://example.org/.well-known/solid") {
-      return mockResponse(undefined, { status: 404 }, url);
-    }
-
-    if (url === "https://example.org/pod/resource") {
-      return mockResponse(
-        undefined,
-        {
-          headers: {
-            "Content-Type": "text/turtle",
-            link: `<${podUrl}>; rel="http://www.w3.org/ns/pim/space#storage"`,
-          },
-        },
-        resourceUrl,
-      );
-    }
-
-    if (url === "https://example.org/pod/.well-known/solid") {
-      return mockResponse(
-        `
-      {
-        "@context":"https://pod.inrupt.com/solid/v1",
-        "consent":"https://consent.pod.inrupt.com",
-        "notificationGateway":"https://notification.pod.inrupt.com",
-        "powerSwitch":"https://pod.inrupt.com/powerswitch/username",
-        "storage":"https://pod.inrupt.com/username/"
-      }`,
-        {
-          headers: { "Content-Type": "application/ld+json" },
-        },
-        url,
-      );
-    }
-
-    throw new Error(`Unhandled request: ${url}, ${JSON.stringify(init)}`);
-  };
-
-  const mockESS20 = () =>
-    jest.spyOn(globalThis, "fetch").mockImplementation(ess20Implementation);
-
-  const mockESS11 = () =>
-    jest.spyOn(globalThis, "fetch").mockImplementation(ess11Implementation);
+  const mockESS = () =>
+    jest.spyOn(globalThis, "fetch").mockImplementation(essDiscoveryDoc);
 
   it("fetches root well known solid by default", async () => {
     // Fetches root well known
-    mockESS20();
+    mockESS();
 
     await getWellKnownSolid(resourceUrl);
 
@@ -3419,7 +3375,7 @@ describe("getWellKnownSolid", () => {
   });
 
   it("uses the given fetcher for root well known solid if provided", async () => {
-    const mockFetch = jest.fn<typeof fetch>(ess20Implementation);
+    const mockFetch = jest.fn<typeof fetch>(essDiscoveryDoc);
 
     await getWellKnownSolid(resourceUrl, { fetch: mockFetch });
 
@@ -3432,55 +3388,6 @@ describe("getWellKnownSolid", () => {
     );
   });
 
-  it("fetches pod root well known solid otherwise", async () => {
-    mockESS11();
-
-    await getWellKnownSolid(resourceUrl);
-
-    expect(fetch).toHaveBeenCalledTimes(3);
-    // Tries the root well known solid first is used to determine well known Solid
-    expect(fetch).toHaveBeenNthCalledWith(
-      1,
-      serverUrl.concat(wellKnownSolid),
-      expect.anything(),
-    );
-    // Checks the resource's location header otherwise
-    expect(fetch).toHaveBeenNthCalledWith(2, resourceUrl, expect.anything());
-    // The advertised podIdentifier (as storage) is used to determine well known Solid
-    expect(fetch).toHaveBeenNthCalledWith(
-      3,
-      podUrl.concat(wellKnownSolid),
-      expect.anything(),
-    );
-  });
-
-  it("uses the given fetcher for pod root well known solid if provided", async () => {
-    const mockFetch = jest.fn<typeof fetch>(ess11Implementation);
-
-    await getWellKnownSolid(resourceUrl, { fetch: mockFetch });
-
-    expect(mockFetch).toHaveBeenCalledTimes(2);
-    expect(fetch).toHaveBeenCalledTimes(1);
-    // Tries the root well known solid first is used to determine well known Solid
-    expect(fetch).toHaveBeenNthCalledWith(
-      1,
-      serverUrl.concat(wellKnownSolid),
-      expect.anything(),
-    );
-    // Checks the resource's location header otherwise
-    expect(mockFetch).toHaveBeenNthCalledWith(
-      1,
-      resourceUrl,
-      expect.anything(),
-    );
-    // The advertised podIdentifier (as storage) is used to determine well known Solid
-    expect(mockFetch).toHaveBeenNthCalledWith(
-      2,
-      podUrl.concat(wellKnownSolid),
-      expect.anything(),
-    );
-  });
-
   it("appends a / to the Pod root if missing before appending .well-known/solid", async () => {
     const spyFetch = jest.spyOn(globalThis, "fetch");
 
@@ -3572,20 +3479,12 @@ describe("getWellKnownSolid", () => {
     expect(spyFetch.mock.calls).toHaveLength(2);
   });
 
-  it("returns the contents of .well-known/solid for the given resource (2.0)", async () => {
-    mockESS20();
+  it("returns the contents of .well-known/solid for the given resource", async () => {
+    mockESS();
 
     const wellKnownSolidResponse = await getWellKnownSolid(resourceUrl);
     // skipIf confuses jest
     // eslint-disable-next-line jest/no-standalone-expect
     expect(wellKnownSolidResponse).toMatchSnapshot();
   });
-
-  it("returns the contents of .well-known/solid for the given resource (1.1)", async () => {
-    mockESS11();
-
-    const wellKnownSolidResponse = await getWellKnownSolid(resourceUrl);
-
-    expect(wellKnownSolidResponse).toMatchSnapshot();
-  });
 });