Skip to content

Commit ead79fd

Browse files
ioedeveloperAniket-Engg
authored andcommitted
Set frame id based on browser
1 parent f7397ba commit ead79fd

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Diff for: apps/remix-ide-e2e/src/tests/contract_verification.test.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ declare global {
66
interface Window { testplugin: { name: string, url: string }; }
77
}
88

9+
const getFrameId = function (browser: NightwatchBrowser) {
10+
return browser.options.desiredCapabilities.browserName === 'chrome' ? 0 : 1
11+
}
12+
913
const tests = {
1014
'@disabled': true,
1115
before: function (browser: NightwatchBrowser, done: VoidFunction) {
@@ -18,7 +22,7 @@ const tests = {
1822
.scrollAndClick('[data-id="pluginManagerComponentActivateButtoncontract-verification"]')
1923
.clickLaunchIcon('contract-verification')
2024
.pause(5000)
21-
.frame(0)
25+
.frame(getFrameId(browser))
2226
.waitForElementVisible('*[data-id="VerifyDescription"]')
2327
},
2428

Diff for: apps/remix-ide-e2e/src/tests/vyper_api.test.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ declare global {
77
interface Window { testplugin: { name: string, url: string }; }
88
}
99

10+
const getFrameId = function (browser: NightwatchBrowser) {
11+
return browser.options.desiredCapabilities.browserName === 'chrome' ? 0 : 1
12+
}
13+
1014
module.exports = {
1115
'@disabled': true,
1216
before: function (browser: NightwatchBrowser, done: VoidFunction) {
@@ -17,7 +21,7 @@ module.exports = {
1721
browser.clickLaunchIcon('pluginManager')
1822
.scrollAndClick('[data-id="pluginManagerComponentActivateButtonvyper"]')
1923
.clickLaunchIcon('vyper')
20-
.frame(0)
24+
.frame(getFrameId(browser))
2125
},
2226

2327
'Should clone the Vyper repo #group1': function (browser: NightwatchBrowser) {
@@ -69,7 +73,7 @@ module.exports = {
6973
browser
7074
// @ts-ignore
7175
.clickLaunchIcon('vyper')
72-
.frame(0)
76+
.frame(getFrameId(browser))
7377
.click('[data-id="compile"]')
7478
.waitForElementVisible({
7579
selector:'[data-id="compilation-details"]',
@@ -90,7 +94,7 @@ module.exports = {
9094
chromeBrowser.setPermission('clipboard-read', 'granted')
9195
chromeBrowser.setPermission('clipboard-write', 'granted')
9296
browser
93-
.frame(0)
97+
.frame(getFrameId(browser))
9498
.click('[data-id="compile"]')
9599
.waitForElementVisible({
96100
selector:'[data-id="compilation-details"]',
@@ -122,7 +126,7 @@ module.exports = {
122126
.addFile('test_error.vy', { content: wrongContract })
123127
.clickLaunchIcon('vyper')
124128
// @ts-ignore
125-
.frame(0)
129+
.frame(getFrameId(browser))
126130
.waitForElementVisible('[data-id="compile"]')
127131
.click('[data-id="compile"]')
128132
.waitForElementVisible({
@@ -142,7 +146,7 @@ module.exports = {
142146
.addFile('test.vy', { content: testContract })
143147
.clickLaunchIcon('vyper')
144148
// @ts-ignore
145-
.frame(0)
149+
.frame(getFrameId(browser))
146150
.waitForElementVisible('[data-id="compile"]')
147151
.click('[data-id="compile"]')
148152
.waitForElementVisible({

0 commit comments

Comments
 (0)