Fixed solid tests for local use

main
jaxoncreed 2 years ago
parent c06ff354da
commit 8632f0dfe3
  1. 27
      packages/solid/test/Integration.test.ts
  2. 2
      packages/solid/test/solidServer.helper.ts

@ -45,6 +45,7 @@ import type {
UnexpectedHttpError, UnexpectedHttpError,
} from "../src/requester/results/error/HttpErrorResult"; } from "../src/requester/results/error/HttpErrorResult";
import type { NoncompliantPodError } from "../src/requester/results/error/NoncompliantPodError"; import type { NoncompliantPodError } from "../src/requester/results/error/NoncompliantPodError";
import { wait } from "./utils.helper";
const TEST_CONTAINER_SLUG = "test_ldo/"; const TEST_CONTAINER_SLUG = "test_ldo/";
const TEST_CONTAINER_URI = const TEST_CONTAINER_URI =
@ -330,8 +331,8 @@ describe("Integration", () => {
expect(result.isError).toBe(true); expect(result.isError).toBe(true);
if (!result.isError) return; if (!result.isError) return;
expect(result.type).toBe("noncompliantPodError"); expect(result.type).toBe("noncompliantPodError");
expect(result.message).toBe( expect(result.message).toMatch(
"Response from https://solidweb.me/jackson3/test_ldo/sample2.ttl is not compliant with the Solid Specification: Resource requests must return a content-type header.", /\Response from .* is not compliant with the Solid Specification: Resource requests must return a content-type header\./,
); );
}); });
@ -351,8 +352,8 @@ describe("Integration", () => {
expect(result.isError).toBe(true); expect(result.isError).toBe(true);
if (!result.isError) return; if (!result.isError) return;
expect(result.type).toBe("noncompliantPodError"); expect(result.type).toBe("noncompliantPodError");
expect(result.message).toBe( expect(result.message).toMatch(
'Response from https://solidweb.me/jackson3/test_ldo/sample2.ttl is not compliant with the Solid Specification: Request returned noncompliant turtle: Unexpected "Error" on line 1.', /\Response from .* is not compliant with the Solid Specification: Request returned noncompliant turtle: Unexpected "Error" on line 1\./,
); );
}); });
@ -386,8 +387,8 @@ describe("Integration", () => {
expect(result.isError).toBe(true); expect(result.isError).toBe(true);
if (!result.isError) return; if (!result.isError) return;
expect(result.type).toBe("noncompliantPodError"); expect(result.type).toBe("noncompliantPodError");
expect(result.message).toBe( expect(result.message).toMatch(
"Response from https://solidweb.me/jackson3/test_ldo/ is not compliant with the Solid Specification: No link header present in request.", /\Response from .* is not compliant with the Solid Specification: No link header present in request\./,
); );
}); });
@ -406,26 +407,22 @@ describe("Integration", () => {
resource.read(), resource.read(),
]); ]);
expect(fetchMock).toHaveBeenCalledTimes(1);
expect(result.type).toBe("dataReadSuccess"); expect(result.type).toBe("dataReadSuccess");
expect(result1.type).toBe("dataReadSuccess"); expect(result1.type).toBe("dataReadSuccess");
expect(fetchMock).toHaveBeenCalledTimes(1);
}); });
it("batches the read request when a read request is in queue", async () => { it("batches the read request when a read request is in queue", async () => {
const resource = solidLdoDataset.getResource(SAMPLE_DATA_URI); const resource = solidLdoDataset.getResource(SAMPLE_DATA_URI);
const [, result, result1] = await Promise.all([ const [, result, result1] = await Promise.all([
resource.update({ resource.createAndOverwrite(),
added: createDataset([
createQuad(namedNode("a"), namedNode("b"), namedNode("c")),
]),
}),
resource.read(), resource.read(),
resource.read(), resource.read(),
]); ]);
expect(fetchMock).toHaveBeenCalledTimes(3);
expect(result.type).toBe("dataReadSuccess"); expect(result.type).toBe("dataReadSuccess");
expect(result1.type).toBe("dataReadSuccess"); expect(result1.type).toBe("dataReadSuccess");
expect(fetchMock).toHaveBeenCalledTimes(2);
}); });
}); });
@ -546,8 +543,8 @@ describe("Integration", () => {
expect(result.isError).toBe(true); expect(result.isError).toBe(true);
if (!result.isError) return; if (!result.isError) return;
expect(result.type).toBe("noncompliantPodError"); expect(result.type).toBe("noncompliantPodError");
expect(result.message).toBe( expect(result.message).toMatch(
"Response from https://solidweb.me/jackson3/test_ldo/ is not compliant with the Solid Specification: No link header present in request.", /\Response from .* is not compliant with the Solid Specification: No link header present in request\./,
); );
}); });

@ -21,7 +21,7 @@ const config = [
]; ];
export const SERVER_DOMAIN = process.env.SERVER || "http://localhost:3001/"; export const SERVER_DOMAIN = process.env.SERVER || "http://localhost:3001/";
export const ROOT_ROUTE = process.env.ROOT_CONTAINER || "example/"; export const ROOT_ROUTE = process.env.ROOT_CONTAINER || "";
export const ROOT_CONTAINER = `${SERVER_DOMAIN}${ROOT_ROUTE}`; export const ROOT_CONTAINER = `${SERVER_DOMAIN}${ROOT_ROUTE}`;
// Use an increased timeout, since the CSS server takes too much setup time. // Use an increased timeout, since the CSS server takes too much setup time.

Loading…
Cancel
Save