Skip to content

Commit

Permalink
Merge pull request #157 from GoogleChrome/update-id-version
Browse files Browse the repository at this point in the history 
Update the unique ID version prefix
  • Loading branch information
@philipwalton
philipwalton committed Jun 1, 2021
2 parents f64dc13 + 83b4a91 commit 79ddad5
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/lib/generateUniqueID.ts
View file
Expand Up @@ -20,5 +20,5 @@
* @return {string}
*/
export const generateUniqueID = () => {
return `v1-${Date.now()}-${Math.floor(Math.random() * (9e12 - 1)) + 1e12}`;
return `v2-${Date.now()}-${Math.floor(Math.random() * (9e12 - 1)) + 1e12}`;
};
38 changes: 19 additions & 19 deletions test/e2e/getCLS-test.js
View file
Expand Up @@ -49,7 +49,7 @@ describe('getCLS()', async function() {

const [cls] = await getBeacons();
assert(cls.value >= 0);
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, cls.delta);
assert.strictEqual(cls.entries.length, 2);
Expand All @@ -68,7 +68,7 @@ describe('getCLS()', async function() {

const [cls] = await getBeacons();
assert(cls.value >= 0);
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, cls.delta);
assert.strictEqual(cls.entries.length, 2);
Expand All @@ -89,7 +89,7 @@ describe('getCLS()', async function() {
const [cls1] = await getBeacons();

assert(cls1.value >= 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 2);
Expand Down Expand Up @@ -118,7 +118,7 @@ describe('getCLS()', async function() {
assert.strictEqual(cls2.name, 'CLS');
assert.strictEqual(cls2.value, cls1.value + cls2.delta);
assert.strictEqual(cls2.entries.length, 2);
assert(cls2.id.match(/^v1-\d+-\d+$/));
assert(cls2.id.match(/^v2-\d+-\d+$/));

await browser.pause(1000);
await stubVisibilityChange('visible');
Expand Down Expand Up @@ -149,7 +149,7 @@ describe('getCLS()', async function() {
assert.strictEqual(cls3.name, 'CLS');
assert.strictEqual(cls3.value, cls2.value + cls3.delta);
assert.strictEqual(cls3.entries.length, 4);
assert(cls3.id.match(/^v1-\d+-\d+$/));
assert(cls3.id.match(/^v2-\d+-\d+$/));

await browser.pause(1000);
await stubVisibilityChange('visible');
Expand Down Expand Up @@ -203,7 +203,7 @@ describe('getCLS()', async function() {
const [cls1, cls2] = await getBeacons();

assert(cls1.value >= 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 1);
Expand Down Expand Up @@ -235,7 +235,7 @@ describe('getCLS()', async function() {
const [cls1, cls2] = await getBeacons();

assert(cls1.value >= 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 1);

Expand Down Expand Up @@ -271,7 +271,7 @@ describe('getCLS()', async function() {

assert(cls1.value >= 0);
assert(cls1.delta >= 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 2);
Expand Down Expand Up @@ -306,7 +306,7 @@ describe('getCLS()', async function() {
const [cls1, cls2] = await getBeacons();

assert(cls1.value > 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 1);
Expand Down Expand Up @@ -351,7 +351,7 @@ describe('getCLS()', async function() {
const [cls1] = await getBeacons();

assert(cls1.value >= 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.delta, cls1.value);
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
Expand All @@ -366,7 +366,7 @@ describe('getCLS()', async function() {
const [cls2] = await getBeacons();

assert(cls2.value >= 0);
assert(cls2.id.match(/^v1-\d+-\d+$/));
assert(cls2.id.match(/^v2-\d+-\d+$/));
assert(cls2.id !== cls1.id);

assert.strictEqual(cls2.delta, cls2.value);
Expand All @@ -383,7 +383,7 @@ describe('getCLS()', async function() {
const [cls3] = await getBeacons();

assert(cls3.value >= 0);
assert(cls3.id.match(/^v1-\d+-\d+$/));
assert(cls3.id.match(/^v2-\d+-\d+$/));
assert(cls3.id !== cls2.id);

assert.strictEqual(cls3.delta, cls3.value);
Expand All @@ -401,7 +401,7 @@ describe('getCLS()', async function() {
const [cls1, cls2] = await getBeacons();

assert(cls1.value > 0);
assert(cls1.id.match(/^v1-\d+-\d+$/));
assert(cls1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls1.name, 'CLS');
assert.strictEqual(cls1.value, cls1.delta);
assert.strictEqual(cls1.entries.length, 1);
Expand All @@ -424,7 +424,7 @@ describe('getCLS()', async function() {
const [cls3] = await getBeacons();

assert(cls3.value > 0);
assert(cls3.id.match(/^v1-\d+-\d+$/));
assert(cls3.id.match(/^v2-\d+-\d+$/));
assert(cls3.id !== cls2.id);
assert.strictEqual(cls3.name, 'CLS');
assert.strictEqual(cls3.value, cls3.delta);
Expand All @@ -443,7 +443,7 @@ describe('getCLS()', async function() {
await beaconCountIs(1);

const [cls] = await getBeacons();
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, 0);
assert.strictEqual(cls.delta, 0);
Expand All @@ -462,7 +462,7 @@ describe('getCLS()', async function() {
await beaconCountIs(1);

const [cls] = await getBeacons();
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, 0);
assert.strictEqual(cls.delta, 0);
Expand All @@ -481,7 +481,7 @@ describe('getCLS()', async function() {
await beaconCountIs(1);

const [cls] = await getBeacons();
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, 0);
assert.strictEqual(cls.delta, 0);
Expand All @@ -500,7 +500,7 @@ describe('getCLS()', async function() {
await beaconCountIs(1);

const [cls] = await getBeacons();
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.value, 0);
assert.strictEqual(cls.delta, 0);
Expand Down Expand Up @@ -537,7 +537,7 @@ describe('getCLS()', async function() {
const [cls] = await getBeacons();

assert(cls.value >= 0);
assert(cls.id.match(/^v1-\d+-\d+$/));
assert(cls.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(cls.name, 'CLS');
assert.strictEqual(cls.delta, cls.value);
assert.strictEqual(cls.entries.length, 1);
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/getFCP-test.js
View file
Expand Up @@ -42,7 +42,7 @@ describe('getFCP()', async function() {

const [fcp] = await getBeacons();
assert(fcp.value >= 0);
assert(fcp.id.match(/^v1-\d+-\d+$/));
assert(fcp.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fcp.name, 'FCP');
assert.strictEqual(fcp.value, fcp.delta);
assert.strictEqual(fcp.entries.length, 1);
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('getFCP()', async function() {

const [fcp1] = await getBeacons();
assert(fcp1.value >= 0);
assert(fcp1.id.match(/^v1-\d+-\d+$/));
assert(fcp1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fcp1.name, 'FCP');
assert.strictEqual(fcp1.value, fcp1.delta);
assert.strictEqual(fcp1.entries.length, 1);
Expand All @@ -119,7 +119,7 @@ describe('getFCP()', async function() {

const [fcp2] = await getBeacons();
assert(fcp2.value >= 0);
assert(fcp2.id.match(/^v1-\d+-\d+$/));
assert(fcp2.id.match(/^v2-\d+-\d+$/));
assert(fcp2.id !== fcp1.id);
assert.strictEqual(fcp2.name, 'FCP');
assert.strictEqual(fcp2.value, fcp2.delta);
Expand All @@ -132,7 +132,7 @@ describe('getFCP()', async function() {

const [fcp3] = await getBeacons();
assert(fcp3.value >= 0);
assert(fcp3.id.match(/^v1-\d+-\d+$/));
assert(fcp3.id.match(/^v2-\d+-\d+$/));
assert(fcp3.id !== fcp2.id);
assert.strictEqual(fcp3.name, 'FCP');
assert.strictEqual(fcp3.value, fcp3.delta);
Expand All @@ -158,7 +158,7 @@ describe('getFCP()', async function() {

const [fcp1] = await getBeacons();
assert(fcp1.value >= 0);
assert(fcp1.id.match(/^v1-\d+-\d+$/));
assert(fcp1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fcp1.name, 'FCP');
assert.strictEqual(fcp1.value, fcp1.delta);
assert.strictEqual(fcp1.entries.length, 0);
Expand All @@ -170,7 +170,7 @@ describe('getFCP()', async function() {

const [fcp2] = await getBeacons();
assert(fcp2.value >= 0);
assert(fcp2.id.match(/^v1-\d+-\d+$/));
assert(fcp2.id.match(/^v2-\d+-\d+$/));
assert(fcp2.id !== fcp1.id);
assert.strictEqual(fcp2.name, 'FCP');
assert.strictEqual(fcp2.value, fcp2.delta);
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/getFID-test.js
View file
Expand Up @@ -47,7 +47,7 @@ describe('getFID()', async function() {

const [fid] = await getBeacons();
assert(fid.value >= 0);
assert(fid.id.match(/^v1-\d+-\d+$/));
assert(fid.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fid.name, 'FID');
assert.strictEqual(fid.value, fid.delta);
assert.strictEqual(fid.entries[0].name, 'mousedown');
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('getFID()', async function() {
const [fid] = await getBeacons();

assert(fid.value >= 0);
assert(fid.id.match(/^v1-\d+-\d+$/));
assert(fid.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fid.name, 'FID');
assert.strictEqual(fid.value, fid.delta);
assert.strictEqual(fid.entries[0].name, 'mousedown');
Expand Down Expand Up @@ -162,7 +162,7 @@ describe('getFID()', async function() {

const [fid1] = await getBeacons();
assert(fid1.value >= 0);
assert(fid1.id.match(/^v1-\d+-\d+$/));
assert(fid1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(fid1.name, 'FID');
assert.strictEqual(fid1.value, fid1.delta);
assert.strictEqual(fid1.entries[0].name, 'mousedown');
Expand All @@ -177,7 +177,7 @@ describe('getFID()', async function() {

const [fid2] = await getBeacons();
assert(fid2.value >= 0);
assert(fid2.id.match(/^v1-\d+-\d+$/));
assert(fid2.id.match(/^v2-\d+-\d+$/));
assert(fid1.id !== fid2.id);
assert.strictEqual(fid2.name, 'FID');
assert.strictEqual(fid2.value, fid2.delta);
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/getLCP-test.js
View file
Expand Up @@ -230,7 +230,7 @@ const assertStandardReportsAreCorrect = (beacons) => {
const [lcp] = beacons;

assert(lcp.value > 500); // Greater than the image load delay.
assert(lcp.id.match(/^v1-\d+-\d+$/));
assert(lcp.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(lcp.name, 'LCP');
assert.strictEqual(lcp.value, lcp.delta);
assert.strictEqual(lcp.entries.length, 2);
Expand All @@ -240,7 +240,7 @@ const assertFullReportsAreCorrect = (beacons) => {
const [lcp1, lcp2] = beacons;

assert(lcp1.value < 500); // Less than the image load delay.
assert(lcp1.id.match(/^v1-\d+-\d+$/));
assert(lcp1.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(lcp1.name, 'LCP');
assert.strictEqual(lcp1.value, lcp1.delta);
assert.strictEqual(lcp1.entries.length, 1);
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/getTTFB-test.js
View file
Expand Up @@ -81,7 +81,7 @@ describe('getTTFB()', async function() {
assert(ttfb.value >= 0);
assert(ttfb.value >= ttfb.entries[0].requestStart);
assert(ttfb.value <= ttfb.entries[0].loadEventEnd);
assert(ttfb.id.match(/^v1-\d+-\d+$/));
assert(ttfb.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(ttfb.name, 'TTFB');
assert.strictEqual(ttfb.value, ttfb.delta);
assert.strictEqual(ttfb.entries.length, 1);
Expand All @@ -102,7 +102,7 @@ describe('getTTFB()', async function() {
assert(ttfb.value >= 0);
assert(ttfb.value >= ttfb.entries[0].requestStart);
assert(ttfb.value <= ttfb.entries[0].loadEventEnd);
assert(ttfb.id.match(/^v1-\d+-\d+$/));
assert(ttfb.id.match(/^v2-\d+-\d+$/));
assert.strictEqual(ttfb.name, 'TTFB');
assert.strictEqual(ttfb.value, ttfb.delta);
assert.strictEqual(ttfb.entries.length, 1);
Expand Down

0 comments on commit 79ddad5

Please sign in to comment.