\s*
Hello<\/h1>\s*
This is the first section.<\/p>\s*<\/div>/);
assert.deepStrictEqual(Object.fromEntries(headers.entries()), {
'content-type': 'text/html; charset=utf-8',
- 'x-surrogate-key': 'Nep3VelSa1voMXR- foo-id_metadata super-test--helix-pages--adobe_head foo-id',
+ 'x-surrogate-key': 'oHjg_WDu20CBS4rD foo-id_metadata super-test--helix-pages--adobe_head foo-id',
'last-modified': 'Wed, 12 Oct 2022 12:50:00 GMT',
});
});
diff --git a/test/sitemap-pipe.test.js b/test/sitemap-pipe.test.js
index 19e469c8..74ea18e4 100644
--- a/test/sitemap-pipe.test.js
+++ b/test/sitemap-pipe.test.js
@@ -38,7 +38,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader: new FileS3Loader().status('sitemap.xml', 500),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -61,7 +61,7 @@ describe('Sitemap Pipe Test', () => {
.status('sitemap.json', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -73,7 +73,7 @@ describe('Sitemap Pipe Test', () => {
'content-type': 'text/plain; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
'x-error': 'failed to load /sitemap.xml from content-bus: 404',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
});
@@ -86,7 +86,7 @@ describe('Sitemap Pipe Test', () => {
.rewrite('sitemap.json', 'sitemap-corrupt.json'),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -98,7 +98,7 @@ describe('Sitemap Pipe Test', () => {
'content-type': 'text/plain; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
'x-error': 'Failed to parse /sitemap.json: Unexpected token \'h\', "this is not JSON" is not valid JSON',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
});
@@ -111,7 +111,7 @@ describe('Sitemap Pipe Test', () => {
.rewrite('sitemap.json', 'sitemap-bad-data.json'),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -123,7 +123,7 @@ describe('Sitemap Pipe Test', () => {
'content-type': 'text/plain; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
'x-error': 'Expected \'data\' array not found in /sitemap.json',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
});
@@ -134,7 +134,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader: new FileS3Loader().status('sitemap.xml', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'preview',
path: '/sitemap.xml',
}),
@@ -145,7 +145,7 @@ describe('Sitemap Pipe Test', () => {
'access-control-allow-origin': '*',
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
});
@@ -156,7 +156,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader: new FileS3Loader().status('sitemap.xml', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'preview',
path: '/sitemap.xml',
}),
@@ -167,16 +167,16 @@ describe('Sitemap Pipe Test', () => {
'access-control-allow-origin': '*',
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
assert.strictEqual(resp.body, `
- https://ref--repo--owner.my.page/
+ https://super-test--repo--owner.my.page/
2023-11-30
- https://ref--repo--owner.my.page/test
+ https://super-test--repo--owner.my.page/test
2023-12-21
`);
@@ -189,7 +189,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader: new FileS3Loader().status('sitemap.xml', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'preview',
path: '/sitemap.xml',
}),
@@ -200,16 +200,16 @@ describe('Sitemap Pipe Test', () => {
'access-control-allow-origin': '*',
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
assert.strictEqual(resp.body, `
- https://ref--repo--owner.my.page/
+ https://super-test--repo--owner.my.page/
2023-11-30
- https://ref--repo--owner.my.page/test
+ https://super-test--repo--owner.my.page/test
2023-12-21
`);
@@ -221,10 +221,10 @@ describe('Sitemap Pipe Test', () => {
log: console,
s3Loader: new FileS3Loader()
.status('sitemap.xml', 404)
- .status('config-all.json', 404),
+ .status('.helix/config-all.json', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'preview',
path: '/sitemap.xml',
}),
@@ -234,16 +234,16 @@ describe('Sitemap Pipe Test', () => {
assert.deepStrictEqual(Object.fromEntries(resp.headers.entries()), {
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
assert.strictEqual(resp.body, `
- https://ref--repo--owner.hlx.page/
+ https://super-test--repo--owner.hlx.page/
2023-11-30
- https://ref--repo--owner.hlx.page/test
+ https://super-test--repo--owner.hlx.page/test
2023-12-21
`);
@@ -256,7 +256,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader: new FileS3Loader().status('sitemap.xml', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -267,7 +267,7 @@ describe('Sitemap Pipe Test', () => {
'access-control-allow-origin': '*',
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
assert.strictEqual(resp.body, `
@@ -288,10 +288,10 @@ describe('Sitemap Pipe Test', () => {
log: console,
s3Loader: new FileS3Loader()
.status('sitemap.xml', 404)
- .status('config-all.json', 404),
+ .status('.helix/config-all.json', 404),
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
}),
@@ -301,16 +301,16 @@ describe('Sitemap Pipe Test', () => {
assert.deepStrictEqual(Object.fromEntries(resp.headers.entries()), {
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
assert.strictEqual(resp.body, `
- https://ref--repo--owner.hlx.live/
+ https://super-test--repo--owner.hlx.live/
2023-11-30
- https://ref--repo--owner.hlx.live/test
+ https://super-test--repo--owner.hlx.live/test
2023-12-21
`);
@@ -384,7 +384,7 @@ describe('Sitemap Pipe Test', () => {
s3Loader,
owner: 'owner',
repo: 'repo',
- ref: 'ref',
+ ref: 'super-test',
partition: 'live',
path: '/sitemap.xml',
timer: {
@@ -401,7 +401,7 @@ describe('Sitemap Pipe Test', () => {
'access-control-allow-origin': '*',
'content-type': 'application/xml; charset=utf-8',
'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
- 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata ref--repo--owner_head foo-id',
+ 'x-surrogate-key': 'lkDPpF5moMrrCXQM foo-id_metadata super-test--repo--owner_head foo-id',
});
});
});
diff --git a/test/steps/fetch-mapped-metadata.test.js b/test/steps/fetch-mapped-metadata.test.js
index 9cd28320..5fb28279 100644
--- a/test/steps/fetch-mapped-metadata.test.js
+++ b/test/steps/fetch-mapped-metadata.test.js
@@ -11,7 +11,7 @@
*/
/* eslint-env mocha */
import assert from 'assert';
-import { PipelineStatusError } from '../../src/index.js';
+import { PipelineResponse, PipelineStatusError } from '../../src/index.js';
import { StaticS3Loader } from '../StaticS3Loader.js';
import fetchMappedMetadata from '../../src/steps/fetch-mapped-metadata.js';
import { FileS3Loader } from '../FileS3Loader.js';
@@ -30,7 +30,7 @@ describe('Fetch Mapped Metadata', () => {
s3Loader: new FileS3Loader()
.rewrite('foo-id/live/mapped/metadata.json', 'metadata-kv.json'),
};
- await fetchMappedMetadata(state);
+ await fetchMappedMetadata(state, new PipelineResponse());
assert.deepEqual(state.mappedMetadata.getModifiers('/new/foo'), {
description: 'Lorem ipsum dolor sit amet.',
keywords: 'ACME, CORP, PR',
@@ -53,7 +53,7 @@ describe('Fetch Mapped Metadata', () => {
body: 'this is no json!',
headers: new Map(),
}),
- });
+ }, new PipelineResponse());
await assert.rejects(promise, new PipelineStatusError(500, 'failed parsing of /mapped/metadata.json: Unexpected token \'h\', "this is no json!" is not valid JSON'));
});
@@ -74,7 +74,7 @@ describe('Fetch Mapped Metadata', () => {
}),
});
await assert.rejects(promise, new PipelineStatusError(500, 'failed loading of /mapped/metadata.json: data must be an array'));
- });
+ }, new PipelineResponse());
it('ignores metadata with no data array', async () => {
const state = {
@@ -94,7 +94,7 @@ describe('Fetch Mapped Metadata', () => {
};
await fetchMappedMetadata(state);
assert.strictEqual(state.mappedMetadata, Modifiers.EMPTY);
- });
+ }, new PipelineResponse());
it('throws error on generic error', async () => {
const promise = fetchMappedMetadata({
@@ -113,5 +113,5 @@ describe('Fetch Mapped Metadata', () => {
}),
});
await assert.rejects(promise, new PipelineStatusError(502, 'failed to load /mapped/metadata.json: 500'));
- });
+ }, new PipelineResponse());
});