diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts index 101cac2f18..ab5e4be726 100644 --- a/apps/remix-ide-e2e/src/tests/workspace.test.ts +++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts @@ -128,9 +128,34 @@ module.exports = { .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/SampleERC20.sol"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') + // check js and ts files are not transformed + .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') + + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`import { deploy } from './web3'`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`import { deploy } from './ethers'`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/web3.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/ethers.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string): Promise => { `) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC20_test.sol"]') }, @@ -151,9 +176,34 @@ module.exports = { .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/SampleERC721.sol"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') + // check js and ts files are not transformed + .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]') + + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`import { deploy } from './web3'`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`import { deploy } from './ethers'`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/web3.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string, gas?: number): Promise => {`) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers.ts"]') + .click('*[data-id="treeViewLitreeViewItemscripts/ethers.ts"]') + .pause(1000) + .getEditorValue((content) => { + browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array, from?: string): Promise => { `) !== -1, + 'Incorrect content') + }) .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]') .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC721_test.sol"]') }, diff --git a/libs/remix-ws-templates/src/templates/ozerc20/scripts/ethers.ts b/libs/remix-ws-templates/src/templates/ozerc20/scripts/ethers.ts index 04c363322a..0cb00c7e47 100644 --- a/libs/remix-ws-templates/src/templates/ozerc20/scripts/ethers.ts +++ b/libs/remix-ws-templates/src/templates/ozerc20/scripts/ethers.ts @@ -1,6 +1,3 @@ - - - export const deploy = async (contractName: string, args: Array, from?: string): Promise => { console.log(`deploying ${contractName}`) diff --git a/libs/remix-ws-templates/src/templates/ozerc721/scripts/ethers.ts b/libs/remix-ws-templates/src/templates/ozerc721/scripts/ethers.ts index 04c363322a..0cb00c7e47 100644 --- a/libs/remix-ws-templates/src/templates/ozerc721/scripts/ethers.ts +++ b/libs/remix-ws-templates/src/templates/ozerc721/scripts/ethers.ts @@ -1,6 +1,3 @@ - - - export const deploy = async (contractName: string, args: Array, from?: string): Promise => { console.log(`deploying ${contractName}`)