Skip to content

Commit 397dc14

Browse files
joeizangAniket-Engg
joeizang
authored and
Aniket-Engg
committed
fix tests
1 parent 74f27cd commit 397dc14

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

‎apps/remix-ide-e2e/src/tests/metamask.test.ts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ const tests = {
4444
},
4545

4646
'Should connect to Sepolia Test Network using MetaMask #group1': function (browser: NightwatchBrowser) {
47-
browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
47+
console.log('Sepolia test running')
48+
browser//.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
4849
.setupMetamask(passphrase, password)
4950
.useCss()
5051
.switchBrowserTab(0)
@@ -94,7 +95,7 @@ const tests = {
9495
.waitForElementPresent('[data-testid="page-container-footer-next"]')
9596
.click('[data-testid="page-container-footer-next"]') // approve the tx
9697
.switchBrowserTab(0) // back to remix
97-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
98+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
9899
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
99100
.perform(() => done())
100101
})
@@ -119,7 +120,7 @@ const tests = {
119120
locateStrategy: 'xpath',
120121
selector: "//span[@class='text-log' and contains(., 'transact to HelloWorld.(fallback) pending')]"
121122
})
122-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
123+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
123124
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
124125
.perform(() => done())
125126
})
@@ -145,7 +146,7 @@ const tests = {
145146
locateStrategy: 'xpath',
146147
selector: "//span[@class='text-log' and contains(., 'transact to HelloWorld.greet pending')]"
147148
})
148-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
149+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
149150
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
150151
.perform(() => done())
151152
})
@@ -186,7 +187,7 @@ const tests = {
186187
.waitForElementPresent('[data-testid="page-container-footer-next"]')
187188
.click('[data-testid="page-container-footer-next"]') // approve the tx
188189
.switchBrowserTab(0) // back to remix
189-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
190+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
190191
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
191192
.perform(() => done())
192193
})
@@ -258,15 +259,15 @@ const tests = {
258259
.scrollAndClick('[data-testid="page-container-footer-next"]')
259260
.pause(2000)
260261
.switchBrowserTab(0) // back to remix
261-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
262+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
262263
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
263264
.perform(() => done())
264265
})
265266
})
266-
},
267+
},
267268

268-
'do transaction #group1': function (browser: NightwatchBrowser) {
269-
browser.waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
269+
'do transaction #group1': function (browser: NightwatchBrowser) {
270+
browser.waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
270271
.clearConsole()
271272
.clickInstance(0)
272273
.clickFunction('delegate - transact (not payable)', { types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"' })
@@ -281,7 +282,7 @@ const tests = {
281282
.scrollAndClick('[data-testid="page-container-footer-next"]')
282283
.pause(2000)
283284
.switchBrowserTab(0) // back to remix
284-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
285+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
285286
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
286287
.perform(() => done())
287288
})
@@ -372,7 +373,6 @@ if (!checkBrowserIsChrome(browser)) {
372373
};
373374
}
374375

375-
376376
const EIP712_Example = {
377377
domain: {
378378
chainId: 11155111,
@@ -399,7 +399,6 @@ const EIP712_Example = {
399399
},
400400
}
401401

402-
403402
const sources = [
404403
{
405404
'Greet.sol': {

‎apps/remix-ide-e2e/src/tests/runAndDeploy_injected.test.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const checkAlerts = function (browser: NightwatchBrowser) {
2525
})
2626
}
2727

28+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
2829
const tests = {
2930
'@disabled': true,
3031
before: function (browser: NightwatchBrowser, done: VoidFunction) {
@@ -88,7 +89,7 @@ const tests = {
8889
.waitForElementPresent('[data-testid="page-container-footer-next"]')
8990
.click('[data-testid="page-container-footer-next"]') // approve the tx
9091
.switchBrowserTab(0) // back to remix
91-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
92+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
9293
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
9394
.perform(() => done())
9495
})
@@ -108,7 +109,7 @@ const tests = {
108109
.waitForElementPresent('[data-testid="page-container-footer-next"]')
109110
.click('[data-testid="page-container-footer-next"]') // approve the tx
110111
.switchBrowserTab(0) // back to remix
111-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
112+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
112113
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
113114
.perform(() => done())
114115
})
@@ -170,7 +171,7 @@ const tests = {
170171
.waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
171172
.click('[data-testid="page-container-footer-next"]') // approve the tx
172173
.switchBrowserTab(0) // back to remix
173-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
174+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
174175
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
175176
.perform(() => done())
176177
})
@@ -187,7 +188,7 @@ const tests = {
187188
.waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
188189
.click('[data-testid="page-container-footer-next"]') // approve the tx
189190
.switchBrowserTab(0) // back to remix
190-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
191+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'view on Etherscan view on Blockscout', 60000)
191192
.waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
192193
.perform(() => done())
193194
})
@@ -272,6 +273,7 @@ const tests = {
272273
}
273274

274275
const branch = process.env.CIRCLE_BRANCH;
276+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
275277
const isMasterBranch = branch === 'master';
276278

277279
module.exports = {

‎apps/remix-ide/src/blockchain/blockchain.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@ export class Blockchain extends Plugin {
743743
<a href={etherScanLink(network.name, txhash)} className="mr-3" target="_blank">
744744
view on Etherscan
745745
</a>
746+
{' '}
746747
{viewBlockScoutLink && <a href={viewBlockScoutLink} target="_blank">
747748
view on Blockscout
748749
</a>}

0 commit comments

Comments
 (0)