From d42c06ae92b3da6d85746cc0c23823738f4f6323 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Wed, 2 Nov 2022 10:54:20 +0100 Subject: [PATCH] locator --- apps/remix-ide-e2e/src/tests/terminal.test.ts | 2 +- .../remix-ide-e2e/src/tests/workspace.test.ts | 105 ++++++++++++++---- 2 files changed, 85 insertions(+), 22 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index a4ea473b66..d3953f54b4 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -7,7 +7,7 @@ module.exports = { before: function (browser: NightwatchBrowser, done: VoidFunction) { init(browser, done, 'http://127.0.0.1:8080?plugins=solidity,udapp', false) }, - 'Should execution a simple console command #group1 #group999': function (browser: NightwatchBrowser) { + 'Should execution a simple console command #group1': function (browser: NightwatchBrowser) { browser .waitForElementVisible('*[data-id="terminalCli"]', 10000) .executeScriptInTerminal('console.log(1 + 1)') diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts index 306cc1e26d..dfafa99bb0 100644 --- a/apps/remix-ide-e2e/src/tests/workspace.test.ts +++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts @@ -52,28 +52,40 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') // check js and ts files are not transformed .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getAccounts')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getaccounts')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, accountIndex?: number): Promise => {`) !== -1, 'Incorrect content') @@ -81,7 +93,10 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]') .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]') .click('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'chai')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'chai')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`const { expect } = require("chai");`) !== -1, 'Incorrect content') @@ -129,28 +144,40 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') // check js and ts files are not transformed .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getAccounts')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getaccounts')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, accountIndex?: number): Promise => {`) !== -1, 'Incorrect content') @@ -177,28 +204,40 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') // check js and ts files are not transformed .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getAccounts')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getaccounts')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, accountIndex?: number): Promise => {`) !== -1, 'Incorrect content') @@ -225,28 +264,40 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') // check js and ts files are not transformed .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getAccounts')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getaccounts')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, accountIndex?: number): Promise => {`) !== -1, 'Incorrect content') @@ -282,21 +333,30 @@ module.exports = { .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') // check js and ts files are not transformed .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './web3-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, './ethers-lib')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1, 'Incorrect content') }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getAccounts')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'web3.eth.getaccounts')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, 'Incorrect content') @@ -305,7 +365,10 @@ module.exports = { }) .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]') - .waitForElementVisible("//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]") + .waitForElementVisible({ + selector: "//div[contains(@class, 'view-line') and contains(.//span, 'ethers.providers')]", + locateStrategy: 'xpath' + }) .getEditorValue((content) => { browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, accountIndex?: number): Promise => {`) !== -1, 'Incorrect content')