Skip to content

Commit 4854a94

Browse files
committed
fix e2e
1 parent 8536e26 commit 4854a94

File tree

9 files changed

+23
-24
lines changed

9 files changed

+23
-24
lines changed

apps/quick-dapp/src/components/ContractGUI/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export function ContractGUI(props: { funcABI: any, funcId: any }) {
8282
<div
8383
className="d-flex p-0 wrapperElement"
8484
data-id={buttonOptions.dataId}
85-
data-title={buttonOptions.title}
85+
data-bs-title={buttonOptions.title}
8686
>
8787
<button
8888
disabled
@@ -94,7 +94,7 @@ export function ContractGUI(props: { funcABI: any, funcId: any }) {
9494
: ''
9595
}`}
9696
data-id={buttonOptions.dataId}
97-
data-title={buttonOptions.title}
97+
data-bs-title={buttonOptions.title}
9898
style={{ pointerEvents: 'none', width: 100 }}
9999
>
100100
{title}
@@ -105,7 +105,7 @@ export function ContractGUI(props: { funcABI: any, funcId: any }) {
105105
className="instance-input w-100 p-2 border-0 rounded-end"
106106
data-id={'multiParamManagerBasicInputField'}
107107
placeholder={inputs}
108-
data-title={inputs}
108+
data-bs-title={inputs}
109109
style={{
110110
height: '2rem',
111111
visibility: !(

apps/remix-dapp/src/components/ContractGUI/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ export function ContractGUI(props: any) {
201201
className="d-flex p-0 wrapperElement"
202202
onClick={handleActionClick}
203203
data-id={buttonOptions.dataId}
204-
data-title={buttonOptions.title}
204+
data-bs-title={buttonOptions.title}
205205
>
206206
<button
207207
className={`text-nowrap overflow-hidden text-truncate ${props.widthClass} btn btn-sm ${buttonOptions.classList}`}
208208
data-id={buttonOptions.dataId}
209-
data-title={buttonOptions.title}
209+
data-bs-title={buttonOptions.title}
210210
disabled={
211211
props.disabled || (props.inputs !== '' && basicInput === '')
212212
}
@@ -230,7 +230,7 @@ export function ContractGUI(props: any) {
230230
}
231231
placeholder={props.inputs}
232232
onChange={handleBasicInput}
233-
data-title={
233+
data-bs-title={
234234
props.funcABI.type === 'fallback' ||
235235
props.funcABI.type === 'receive'
236236
? `'(${props.funcABI.type}')`

apps/remix-ide-e2e/src/commands/clickFunction.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ClickFunction extends EventEmitter {
1111
expectedInput?: NightwatchClickFunctionExpectedInput
1212
): NightwatchBrowser {
1313
this.api
14-
.waitForElementPresent('.instance *[data-title="' + fnFullName + '"]')
14+
.waitForElementPresent('.instance *[data-bs-title="' + fnFullName + '"]')
1515
.perform(function (client, done) {
1616
client.execute(
1717
function () {
@@ -22,7 +22,7 @@ class ClickFunction extends EventEmitter {
2222
function () {
2323
if (expectedInput) {
2424
client.setValue(
25-
'#runTabView input[data-title="' + expectedInput.types + '"]',
25+
'#runTabView input[data-bs-title="' + expectedInput.types + '"]',
2626
expectedInput.values,
2727
(_) => _
2828
)
@@ -31,7 +31,7 @@ class ClickFunction extends EventEmitter {
3131
}
3232
)
3333
})
34-
.scrollAndClick('.instance *[data-title="' + fnFullName + '"]')
34+
.scrollAndClick('.instance *[data-bs-title="' + fnFullName + '"]')
3535
.pause(2000)
3636
.perform(() => {
3737
this.emit('complete')

apps/remix-ide-e2e/src/commands/testConstantFunction.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function testConstantFunction(
3939
cb: VoidFunction
4040
) {
4141
browser
42-
.waitForElementPresent('.instance *[data-title="' + fnFullName + '"]')
42+
.waitForElementPresent('.instance *[data-bs-title="' + fnFullName + '"]')
4343
.perform(function (client, done) {
4444
client.execute(
4545
function () {
@@ -51,18 +51,18 @@ function testConstantFunction(
5151
if (expectedInput) {
5252
client
5353
.waitForElementPresent(
54-
'#runTabView input[data-title="' + expectedInput.types + '"]'
54+
'#runTabView input[data-bs-title="' + expectedInput.types + '"]'
5555
)
5656
.setValue(
57-
'#runTabView input[data-title="' + expectedInput.types + '"]',
57+
'#runTabView input[data-bs-title="' + expectedInput.types + '"]',
5858
expectedInput.values
5959
)
6060
}
6161
done()
6262
}
6363
)
6464
})
65-
.click(`#instance${address} *[data-title="${fnFullName}"]`)
65+
.click(`#instance${address} *[data-bs-title="${fnFullName}"]`)
6666
.pause(1000)
6767
.waitForElementPresent(
6868
'#instance' + address + ' .udapp_contractActionsContainer .udapp_value'

apps/remix-ide-e2e/src/tests/debugger.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ module.exports = {
1919
.clickLaunchIcon('solidity').click('*[data-id="compilerContainerCompileBtn"]')
2020
.pause(4000)
2121
.clickLaunchIcon('udapp')
22-
.waitForElementPresent('*[data-title="Deploy - transact (not payable)"]', 60000)
23-
.click('*[data-title="Deploy - transact (not payable)"]')
22+
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 60000)
23+
.click('*[data-bs-title="Deploy - transact (not payable)"]')
2424
.debugTransaction(0)
2525
.waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
2626
.clearConsole()
@@ -30,8 +30,8 @@ module.exports = {
3030
browser.waitForElementVisible('*[data-id="verticalIconsKindudapp"]')
3131
.clickLaunchIcon('udapp')
3232
.clickInstance(0)
33-
.scrollAndClick('*[data-title="string name, uint256 goal"]')
34-
.setValue('*[data-title="string name, uint256 goal"]', '"toast", 999')
33+
.scrollAndClick('*[data-bs-title="string name, uint256 goal"]')
34+
.setValue('*[data-bs-title="string name, uint256 goal"]', '"toast", 999')
3535
.click('*[data-id="createProject - transact (not payable)"]')
3636
.debugTransaction(0)
3737
.pause(2000)
@@ -88,7 +88,7 @@ module.exports = {
8888
.clickLaunchIcon('solidity')
8989
.testContracts('externalImport.sol', sources[1]['externalImport.sol'], ['ERC20'])
9090
.clickLaunchIcon('udapp')
91-
.waitForElementPresent('*[data-title="Deploy - transact (not payable)"]', 35000)
91+
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 35000)
9292
.selectContract('ERC20')
9393
.createContract('"tokenName", "symbol"')
9494
.debugTransaction(0)
@@ -159,7 +159,7 @@ module.exports = {
159159
.clickLaunchIcon('solidity')
160160
.testContracts('locals.sol', sources[3]['locals.sol'], ['testLocals'])
161161
.clickLaunchIcon('udapp')
162-
.waitForElementPresent('*[data-title="Deploy - transact (not payable)"]', 40000)
162+
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 40000)
163163
.createContract('')
164164
.pause(2000)
165165
.clearConsole()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ const tests = {
111111
'Should run transaction (greet function) on Sepolia Test Network using MetaMask': function (browser: NightwatchBrowser) {
112112
browser.clearConsole().waitForElementPresent('*[data-id="remixIdeSidePanel"]')
113113
.clearConsole()
114-
.waitForElementPresent('*[data-title="string _message"]')
115-
.setValue('*[data-title="string _message"]', 'test')
114+
.waitForElementPresent('*[data-bs-title="string _message"]')
115+
.setValue('*[data-bs-title="string _message"]', 'test')
116116
.waitForElementVisible('*[data-id="greet - transact (not payable)"]')
117117
.click('*[data-id="greet - transact (not payable)"]')
118118
.pause(1000)

apps/remix-ide-e2e/src/tests/transactionExecution.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ module.exports = {
229229
.createContract('42, 24')
230230
.openFile('Storage.sol')
231231
.clickLaunchIcon('udapp')
232-
.waitForElementVisible('*[data-title="uint256 p"]', 10000)
232+
.waitForElementVisible('*[data-bs-title="uint256 p"]', 10000)
233233
.createContract('102') // this creation will fail if the component hasn't been properly reset.
234234
.clickInstance(1)
235235
.clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '24' })

libs/remix-ui/run-tab/src/lib/components/account.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ export function AccountUI(props: AccountProps) {
423423
<Dropdown.Item
424424
key={index}
425425
eventKey={selectedAccount}
426-
onSelect={(e) => {
426+
onClick={(e) => {
427427
props.setAccount(value)
428428
}}
429429
data-id={`txOriginSelectAccountItem-${value}`}

libs/remix-ui/run-tab/src/lib/reducers/runTab.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
130130

131131
case SET_SELECTED_ACCOUNT: {
132132
const payload: string = action.payload
133-
134133
return {
135134
...state,
136135
accounts: {

0 commit comments

Comments
 (0)