Skip to content

Commit

Permalink
Merge pull request decentraland#15 from NodeFactoryIo/beroburny/fix-t…
Browse files Browse the repository at this point in the history
…ester

Fix tester
  • Loading branch information
BeroBurny authored Feb 17, 2021
2 parents a1a4e90 + af70295 commit 831de61
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.
24 changes: 8 additions & 16 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export async function getMetamask(
options: MetamaskOptions = {}
): Promise<Dappeteer> {
const metamaskPage = await closeHomeScreen(browser)
// const metamaskPage = await getMetamaskPage(browser, options.extensionId, options.extensionUrl)
await confirmWelcomeScreen(metamaskPage)

await importAccount(
Expand All @@ -59,9 +58,9 @@ export async function getMetamask(
options.password || 'password1234'
)

let signedIn = true
let signedIn = true;

closeNotificationPage(browser)
await closeNotificationPage(browser);

return {
lock: async () => {
Expand Down Expand Up @@ -160,6 +159,7 @@ export async function getMetamask(
if (!signedIn) {
throw new Error("You haven't signed in yet")
}
await metamaskPage.waitForTimeout(500);
await metamaskPage.reload()
if (options) {
if (options.gas) {
Expand Down Expand Up @@ -199,7 +199,10 @@ export async function getMetamask(
}
await metamaskPage.reload()

const button = await metamaskPage.waitForSelector('.request-signature__footer__sign-button')
const button = await Promise.race([
metamaskPage.waitForSelector('.request-signature__footer__sign-button'),
metamaskPage.waitForSelector('.signature-request-footer button:last-child'),
]);
await button.click()
},

Expand Down Expand Up @@ -233,7 +236,7 @@ async function closeHomeScreen(browser: puppeteer.Browser): Promise<puppeteer.Pa

async function closeNotificationPage(browser: puppeteer.Browser): Promise<void> {
browser.on('targetcreated', async target => {
if (target.url() === 'chrome-extension://plkiloelkgnphnmaonlbbjbiphdalblo/notification.html') {
if (target.url().match("chrome-extension://[a-z]+/notification.html")) {
try {
const page = await target.page()
await page.close()
Expand All @@ -244,17 +247,6 @@ async function closeNotificationPage(browser: puppeteer.Browser): Promise<void>
})
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
async function getMetamaskPage(browser, extensionId, extensionUrl): Promise<void> {
// eslint-disable-next-line @typescript-eslint/naming-convention
const EXTENSION_ID = extensionId || 'nkbihfbeogaeaoehlefnkodbefgpgknn'
// eslint-disable-next-line @typescript-eslint/naming-convention
const EXTENSION_URL = extensionUrl || `chrome-extension://${EXTENSION_ID}/popup.html`

const metamaskPage = await browser.newPage()
await metamaskPage.goto(EXTENSION_URL)
}

async function confirmWelcomeScreen(metamaskPage: puppeteer.Page): Promise<void> {
const continueButton = await metamaskPage.waitForSelector('.welcome-page button')
await continueButton.click()
Expand Down
3 changes: 2 additions & 1 deletion test/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ async function deployContract(provider: ganache.Provider): Promise<{address: str
// create file data for dapp
const dataJsPath = path.join(__dirname, 'dapp', 'data.js');
const data = `const ContractInfo = ${JSON.stringify({...counterContractInfo, ...counterContract.options}, null, 2)}`;
fs.writeFileSync(dataJsPath, data);
await new Promise(resolve => {fs.writeFile(dataJsPath, data, resolve)});
console.log('path:', dataJsPath);

return {...CounterContract, ...counterContract, ...counterContract.options};
}
Expand Down

0 comments on commit 831de61

Please sign in to comment.