fix url test

pull/4346/head
filip mertens 1 year ago
parent feb7535fd7
commit 1bbe4bbcaf
  1. 23
      apps/remix-ide-e2e/src/tests/url.test.ts
  2. 6
      libs/remix-ui/solidity-compiler/src/lib/components/compiler-dropdown.tsx
  3. 2
      libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx

@ -224,8 +224,10 @@ module.exports = {
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.click('*[data-id="scConfigExpander"]') .click('*[data-id="scConfigExpander"]')
.waitForElementVisible('#versionSelector option[data-id="selected"]') .waitForElementVisible({
.assert.containsText('#versionSelector option[data-id="selected"]', '0.8.16+commit.07a7930e') selector: "//*[@data-id='selectedVersion' and contains(.,'0.8.16+commit.07a7930e')]",
locateStrategy: 'xpath'
})
.assert.containsText('#evmVersionSelector option[data-id="selected"]', 'istanbul') .assert.containsText('#evmVersionSelector option[data-id="selected"]', 'istanbul')
.assert.containsText('#compilierLanguageSelector option[data-id="selected"]', 'Yul') .assert.containsText('#compilierLanguageSelector option[data-id="selected"]', 'Yul')
.verify.elementPresent('#optimize:checked') .verify.elementPresent('#optimize:checked')
@ -235,14 +237,18 @@ module.exports = {
.refreshPage() .refreshPage()
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.waitForElementVisible('#versionSelector option[data-id="selected"]') .waitForElementVisible({
.assert.containsText('#versionSelector option[data-id="selected"]', '0.8.7+commit.e28d00a7') selector: "//*[@data-id='selectedVersion' and contains(.,'0.8.7+commit.e28d00a7')]",
locateStrategy: 'xpath'
})
.url('http://127.0.0.1:8080/#version=0.8.15+commit.e14f2714') .url('http://127.0.0.1:8080/#version=0.8.15+commit.e14f2714')
.refreshPage() .refreshPage()
.pause(3000) .pause(3000)
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.waitForElementVisible('#versionSelector option[data-id="selected"]') .waitForElementVisible({
.assert.containsText('#versionSelector option[data-id="selected"]', '0.8.15+commit.e14f2714') selector: "//*[@data-id='selectedVersion' and contains(.,'0.8.15+commit.e14f2714')]",
locateStrategy: 'xpath'
})
}, },
'Should load using compiler from link passed in remix URL #group3': function (browser: NightwatchBrowser) { 'Should load using compiler from link passed in remix URL #group3': function (browser: NightwatchBrowser) {
@ -253,7 +259,10 @@ module.exports = {
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.click('*[data-id="scConfigExpander"]') .click('*[data-id="scConfigExpander"]')
.assert.containsText('#versionSelector option[data-id="selected"]', 'custom') .waitForElementVisible({
selector: "//*[@data-id='selectedVersion' and contains(.,'custom')]",
locateStrategy: 'xpath'
})
// default values // default values
.assert.containsText('#evmVersionSelector option[data-id="selected"]', 'default') .assert.containsText('#evmVersionSelector option[data-id="selected"]', 'default')
.verify.elementPresent('#optimize') .verify.elementPresent('#optimize')

@ -15,7 +15,7 @@ interface compilerDropdownProps {
defaultVersion: string, defaultVersion: string,
allversions: compilerVersion[], allversions: compilerVersion[],
handleLoadVersion: (url: string) => void, handleLoadVersion: (url: string) => void,
_shouldBeAdded: (version: string) => {}, _shouldBeAdded: (version: string) => boolean,
onlyDownloaded: boolean onlyDownloaded: boolean
} }
@ -28,12 +28,12 @@ export const CompilerDropdown = (props: compilerDropdownProps) => {
<div style={{ flexGrow: 1, overflow: 'hidden', display:'flex', justifyContent:'left' }}> <div style={{ flexGrow: 1, overflow: 'hidden', display:'flex', justifyContent:'left' }}>
<div className="text-truncate"> <div className="text-truncate">
{customVersions.map((url, i) => { {customVersions.map((url, i) => {
if (selectedVersion === url) return (<span key={i}>custom</span>) if (selectedVersion === url) return (<span data-id="selectedVersion" key={i}>custom</span>)
})} })}
{allversions.map((build, i) => { {allversions.map((build, i) => {
if ((selectedVersion || defaultVersion) === build.path) { if ((selectedVersion || defaultVersion) === build.path) {
return (<span key={i}>{build.longVersion}</span>) return (<span data-id="selectedVersion" key={i}>{build.longVersion}</span>)
} }
})} })}
</div> </div>

@ -166,7 +166,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
prerelease: '' prerelease: ''
} }
const binVersions = data.binList const binVersions = data.binList
let selectorList = binVersions const selectorList = binVersions
const wasmVersions = data.wasmList const wasmVersions = data.wasmList
selectorList.forEach((compiler, index) => { selectorList.forEach((compiler, index) => {

Loading…
Cancel
Save