Skip to content

Commit

Permalink
remove mock ppom
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinistevam
vinistevam committed Oct 24, 2024
1 parent 13b5ff3 commit 6daf7e6
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 81 deletions.
160 changes: 80 additions & 80 deletions test/e2e/mock-e2e.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ const {
DEFAULT_FEATURE_FLAGS_RESPONSE: BRIDGE_DEFAULT_FEATURE_FLAGS_RESPONSE,
} = require('./tests/bridge/constants');

const CDN_CONFIG_PATH = 'test/e2e/mock-cdn/cdn-config.txt';
const CDN_STALE_DIFF_PATH = 'test/e2e/mock-cdn/cdn-stale-diff.txt';
const CDN_STALE_PATH = 'test/e2e/mock-cdn/cdn-stale.txt';
const PPOM_VERSION_PATH = 'test/e2e/mock-cdn/ppom-version.json';
const PPOM_VERSION_HEADERS_PATH = 'test/e2e/mock-cdn/ppom-version-headers.json';

const CDN_CONFIG_RES_HEADERS_PATH =
'test/e2e/mock-cdn/cdn-config-res-headers.json';
const CDN_STALE_DIFF_RES_HEADERS_PATH =
'test/e2e/mock-cdn/cdn-stale-diff-res-headers.json';
const CDN_STALE_RES_HEADERS_PATH =
'test/e2e/mock-cdn/cdn-stale-res-headers.json';
// const CDN_CONFIG_PATH = 'test/e2e/mock-cdn/cdn-config.txt';
// const CDN_STALE_DIFF_PATH = 'test/e2e/mock-cdn/cdn-stale-diff.txt';
// const CDN_STALE_PATH = 'test/e2e/mock-cdn/cdn-stale.txt';
// const PPOM_VERSION_PATH = 'test/e2e/mock-cdn/ppom-version.json';
// const PPOM_VERSION_HEADERS_PATH = 'test/e2e/mock-cdn/ppom-version-headers.json';

// const CDN_CONFIG_RES_HEADERS_PATH =
// 'test/e2e/mock-cdn/cdn-config-res-headers.json';
// const CDN_STALE_DIFF_RES_HEADERS_PATH =
// 'test/e2e/mock-cdn/cdn-stale-diff-res-headers.json';
// const CDN_STALE_RES_HEADERS_PATH =
// 'test/e2e/mock-cdn/cdn-stale-res-headers.json';

const AGGREGATOR_METADATA_PATH =
'test/e2e/mock-response-data/aggregator-metadata.json';
Expand Down Expand Up @@ -603,74 +603,74 @@ async function setupMocking(
};
});

const PPOM_VERSION = fs.readFileSync(PPOM_VERSION_PATH);
const PPOM_VERSION_HEADERS = fs.readFileSync(PPOM_VERSION_HEADERS_PATH);
const CDN_CONFIG = fs.readFileSync(CDN_CONFIG_PATH);
const CDN_STALE = fs.readFileSync(CDN_STALE_PATH);
const CDN_STALE_DIFF = fs.readFileSync(CDN_STALE_DIFF_PATH);
const CDN_CONFIG_RES_HEADERS = fs.readFileSync(CDN_CONFIG_RES_HEADERS_PATH);
const CDN_STALE_RES_HEADERS = fs.readFileSync(CDN_STALE_RES_HEADERS_PATH);
const CDN_STALE_DIFF_RES_HEADERS = fs.readFileSync(
CDN_STALE_DIFF_RES_HEADERS_PATH,
);

await server
.forHead(
'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json',
)
.thenCallback(() => {
return {
statusCode: 200,
};
});

await server
.forGet(
'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json',
)
.thenCallback(() => {
return {
statusCode: 200,
json: JSON.parse(PPOM_VERSION),
headers: JSON.parse(PPOM_VERSION_HEADERS),
};
});

await server
.forGet(
/^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/config\/0x1\/(.*)/u,
)
.thenCallback(() => {
return {
statusCode: 200,
rawBody: CDN_CONFIG,
headers: JSON.parse(CDN_CONFIG_RES_HEADERS),
};
});

await server
.forGet(
/^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/stale_diff\/0x1\/(.*)/u,
)
.thenCallback(() => {
return {
statusCode: 200,
rawBody: CDN_STALE_DIFF,
headers: JSON.parse(CDN_STALE_DIFF_RES_HEADERS),
};
});

await server
.forGet(
/^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/stale\/0x1\/(.*)/u,
)
.thenCallback(() => {
return {
statusCode: 200,
rawBody: CDN_STALE,
headers: JSON.parse(CDN_STALE_RES_HEADERS),
};
});
// const PPOM_VERSION = fs.readFileSync(PPOM_VERSION_PATH);
// const PPOM_VERSION_HEADERS = fs.readFileSync(PPOM_VERSION_HEADERS_PATH);
// const CDN_CONFIG = fs.readFileSync(CDN_CONFIG_PATH);
// const CDN_STALE = fs.readFileSync(CDN_STALE_PATH);
// const CDN_STALE_DIFF = fs.readFileSync(CDN_STALE_DIFF_PATH);
// const CDN_CONFIG_RES_HEADERS = fs.readFileSync(CDN_CONFIG_RES_HEADERS_PATH);
// const CDN_STALE_RES_HEADERS = fs.readFileSync(CDN_STALE_RES_HEADERS_PATH);
// const CDN_STALE_DIFF_RES_HEADERS = fs.readFileSync(
// CDN_STALE_DIFF_RES_HEADERS_PATH,
// );

// await server
// .forHead(
// 'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json',
// )
// .thenCallback(() => {
// return {
// statusCode: 200,
// };
// });

// await server
// .forGet(
// 'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json',
// )
// .thenCallback(() => {
// return {
// statusCode: 200,
// json: JSON.parse(PPOM_VERSION),
// headers: JSON.parse(PPOM_VERSION_HEADERS),
// };
// });

// await server
// .forGet(
// /^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/config\/0x1\/(.*)/u,
// )
// .thenCallback(() => {
// return {
// statusCode: 200,
// rawBody: CDN_CONFIG,
// headers: JSON.parse(CDN_CONFIG_RES_HEADERS),
// };
// });

// await server
// .forGet(
// /^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/stale_diff\/0x1\/(.*)/u,
// )
// .thenCallback(() => {
// return {
// statusCode: 200,
// rawBody: CDN_STALE_DIFF,
// headers: JSON.parse(CDN_STALE_DIFF_RES_HEADERS),
// };
// });

// await server
// .forGet(
// /^https:\/\/static.cx.metamask.io\/api\/v1\/confirmations\/ppom\/stale\/0x1\/(.*)/u,
// )
// .thenCallback(() => {
// return {
// statusCode: 200,
// rawBody: CDN_STALE,
// headers: JSON.parse(CDN_STALE_RES_HEADERS),
// };
// });

await mockEmptyStalelistAndHotlist(server);

Expand Down
1 change: 0 additions & 1 deletion test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ describe('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () {
text: 'Localhost 7777',
});

await driver.waitForSelector({ text: 'Confirm' });
await driver.clickElement({ text: 'Confirm', tag: 'button' });

await driver.waitUntilXWindowHandles(4);
Expand Down

0 comments on commit 6daf7e6

Please sign in to comment.