mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

fix failing proxy e2e

Browse Source
pull/5370/head
Joseph Izang 2 years ago
parent a717a5fca3
commit 33fed3e505
2 changed files with 16 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      apps/remix-ide-e2e/src/tests/proxy.test.ts
  2. 19
      libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx

11
apps/remix-ide-e2e/src/tests/proxy.test.ts
Unescape View File

@ -123,11 +123,12 @@ module.exports = {
.click('select.udapp_contractNames option[value=MyInitializedToken]') .click('select.udapp_contractNames option[value=MyInitializedToken]')
.waitForElementPresent('[data-id="contractGUIDeployWithProxyLabel"]') .waitForElementPresent('[data-id="contractGUIDeployWithProxyLabel"]')
.click('[data-id="contractGUIDeployWithProxyLabel"]') .click('[data-id="contractGUIDeployWithProxyLabel"]')
.pause(5000) .useXpath()
.waitForElementPresent('input[title="tokenName"]') .waitForElementPresent('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[1]/input')
.waitForElementPresent('input[title="tokenSymbol"]') .waitForElementPresent('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[2]/input')
.setValue('input[title="tokenName"]', 'Remix') .setValue('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[1]/input', 'Remix')
.setValue('input[title="tokenSymbol"]', "R") .setValue('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[2]/input', "R")
.useCss()
.createContract('') .createContract('')
.waitForElementContainsText('[data-id="udappNotifyModalDialogModalTitle-react"]', 'Deploy Implementation & Proxy (ERC1967)') .waitForElementContainsText('[data-id="udappNotifyModalDialogModalTitle-react"]', 'Deploy Implementation & Proxy (ERC1967)')
.waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]') .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')

19
libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
Unescape View File

@ -435,20 +435,21 @@ export function ContractGUI (props: ContractGUIProps) {
onChange={(e) => handleDeployProxySelect(e.target.checked)} onChange={(e) => handleDeployProxySelect(e.target.checked)}
checked={deployState.deploy} checked={deployState.deploy}
/> />
<CustomTooltip {/* <CustomTooltip
tooltipText={<span>An ERC1967 proxy contract<br/> will be deployed along<br/> with the selected <br/>implementation contract.</span>} tooltipText={<span>An ERC1967 proxy contract<br/> will be deployed along<br/> with the selected <br/>implementation contract.</span>}
placement={"bottom-start"} placement={"bottom-start"}
tooltipClasses="text-wrap" tooltipClasses="text-wrap"
tooltipId="deployWithProxyTooltip" tooltipId="deployWithProxyTooltip"
> > */}
<label <label
// title="An ERC1967 proxy contract will be deployed along with the selected implementation contract"
htmlFor="deployWithProxy" htmlFor="deployWithProxy"
data-id="contractGUIDeployWithProxyLabel" data-id="contractGUIDeployWithProxyLabel"
className="m-0 form-check-label w-100 custom-control-label udapp_checkboxAlign" className="m-0 form-check-label w-100 custom-control-label udapp_checkboxAlign"
> >
Deploy with Proxy Deploy with Proxy
</label> </label>
</CustomTooltip> {/* </CustomTooltip> */}
</div> </div>
<div> <div>
{props.initializerOptions && {props.initializerOptions &&
@ -484,12 +485,12 @@ export function ContractGUI (props: ContractGUIProps) {
{" "} {" "}
{inp.name}:{" "} {inp.name}:{" "}
</label> </label>
<CustomTooltip {/* <CustomTooltip
tooltipText={inp.name} tooltipText={inp.name}
tooltipClasses="text-wrap" tooltipClasses="text-wrap"
tooltipId="initializeFieldsTooltip" tooltipId="initializeFieldsTooltip"
placement="top-start" placement="top-start"
> > */}
<input <input
ref={(el) => { ref={(el) => {
initializeFields.current[index] = el; initializeFields.current[index] = el;
@ -498,7 +499,7 @@ export function ContractGUI (props: ContractGUIProps) {
className="form-control udapp_input" className="form-control udapp_input"
placeholder={inp.type} placeholder={inp.type}
/> />
</CustomTooltip> {/* </CustomTooltip> */}
</div> </div>
); );
})} })}
@ -515,12 +516,12 @@ export function ContractGUI (props: ContractGUIProps) {
onChange={(e) => handleUpgradeImpSelect(e.target.checked)} onChange={(e) => handleUpgradeImpSelect(e.target.checked)}
checked={deployState.upgrade} checked={deployState.upgrade}
/> />
<CustomTooltip {/* <CustomTooltip
tooltipText="The implementation contract will be deployed and then the proxy contract will be updated with new implementation's address." tooltipText="The implementation contract will be deployed and then the proxy contract will be updated with new implementation's address."
tooltipClasses="text-wrap" tooltipClasses="text-wrap"
tooltipId="upgradeImplementationTooltip" tooltipId="upgradeImplementationTooltip"
placement="top-start" placement="top-start"
> > */}
<label <label
htmlFor="upgradeImplementation" htmlFor="upgradeImplementation"
data-id="contractGUIUpgradeImplementationLabel" data-id="contractGUIUpgradeImplementationLabel"
@ -528,7 +529,7 @@ export function ContractGUI (props: ContractGUIProps) {
> >
Upgrade with Proxy Upgrade with Proxy
</label> </label>
</CustomTooltip> {/* </CustomTooltip> */}
</div> </div>
<span onClick={handleToggleUpgradeImp}> <span onClick={handleToggleUpgradeImp}>
<i <i

Write Preview
Loading…
Cancel
Save