pull/5370/head
filip mertens 1 year ago committed by Joseph Izang
parent fe47e6bf64
commit 8a751b7e89
  1. 42
      apps/remix-ide-e2e/src/tests/vyper_api.test.ts
  2. 2
      apps/vyper/src/app/components/VyperResult.tsx

@ -47,27 +47,22 @@ module.exports = {
.frame(0) .frame(0)
.click('[data-id="remote-compiler"]') .click('[data-id="remote-compiler"]')
.click('[data-id="compile"]') .click('[data-id="compile"]')
.isVisible({ .waitForElementVisible({
selector: '[data-id="copy-abi"]', selector:'[data-id="compilation-details"]',
timeout: 4000, timeout: 60000
abortOnFailure: false, })
suppressNotFoundErrors: true .click('[data-id="compilation-details"]')
}, (okVisible) => { .frameParent()
if (okVisible.value === null) { .waitForElementVisible('[data-id="copy-abi"]')
console.log('retrying compilation...') .waitForElementVisible({
browser.click('[data-id="compile"]').waitForElementVisible('[data-id="copy-abi"]') selector: "//*[@class='variable-value' and contains(.,'highestBidder')]",
} else{ locateStrategy: 'xpath',
browser.assert.ok(okVisible.value === true, 'ABI should be visible')
}
}) })
}, },
'Compile test contract and deploy to remix VM #group1': function (browser: NightwatchBrowser) { 'Compile test contract and deploy to remix VM #group1': function (browser: NightwatchBrowser) {
let contractAddress let contractAddress
browser browser
.frameParent()
.clickLaunchIcon('filePanel') .clickLaunchIcon('filePanel')
.switchWorkspace('default_workspace') .switchWorkspace('default_workspace')
.addFile('test.vy', { content: testContract }) .addFile('test.vy', { content: testContract })
@ -75,20 +70,13 @@ module.exports = {
// @ts-ignore // @ts-ignore
.frame(0) .frame(0)
.click('[data-id="compile"]') .click('[data-id="compile"]')
.isVisible({ .waitForElementVisible({
selector: '[data-id="copy-abi"]', selector:'[data-id="compilation-details"]',
timeout: 4000, timeout: 60000
abortOnFailure: false,
suppressNotFoundErrors: true
}, (okVisible) => {
if (okVisible.value === null) {
console.log('retrying compilation...')
browser.click('[data-id="compile"]').waitForElementVisible('[data-id="copy-abi"]')
} else{
browser.assert.ok(okVisible.value === true, 'ABI should be visible')
}
}) })
.click('[data-id="compilation-details"]')
.frameParent() .frameParent()
.waitForElementVisible('[data-id="copy-abi"]')
.clickLaunchIcon('udapp') .clickLaunchIcon('udapp')
.createContract('') .createContract('')
.clickInstance(0) .clickInstance(0)

@ -58,7 +58,7 @@ function VyperResult({ output, plugin }: VyperResultProps) {
<> <>
<div className="border border-top"></div> <div className="border border-top"></div>
<div className="d-flex justify-content-center px-2 w-100"> <div className="d-flex justify-content-center px-2 w-100">
<button className="btn btn-secondary w-100" onClick={async () => { <button data-id="compilation-details" className="btn btn-secondary w-100" onClick={async () => {
await plugin?.call('vyperCompilationDetails', 'showDetails', output) await plugin?.call('vyperCompilationDetails', 'showDetails', output)
}}> }}>
<span>Compilation Details</span> <span>Compilation Details</span>

Loading…
Cancel
Save