aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.circleci/config.yml8
-rw-r--r--app/scripts/controllers/network/network.js12
-rw-r--r--gulpfile.js55
-rw-r--r--package.json2
-rw-r--r--test/e2e/beta/from-import-beta-ui.spec.js19
-rw-r--r--test/e2e/beta/metamask-beta-responsive-ui.spec.js13
-rw-r--r--test/e2e/beta/metamask-beta-ui.spec.js77
-rwxr-xr-xtest/e2e/beta/run-all.sh3
8 files changed, 132 insertions, 57 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 807ed042c..686a996c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,11 +23,9 @@ workflows:
- test-e2e-chrome:
requires:
- prep-deps-npm
- - prep-build
- test-e2e-firefox:
requires:
- prep-deps-npm
- - prep-build
# - test-e2e-beta-drizzle:
# requires:
# - prep-deps-npm
@@ -191,7 +189,8 @@ jobs:
at: .
- run:
name: test:e2e:chrome
- command: npm run test:e2e:chrome
+ command: npm run build:test && npm run test:e2e:chrome
+ no_output_timeout: 20m
- store_artifacts:
path: test-artifacts
destination: test-artifacts
@@ -208,7 +207,8 @@ jobs:
at: .
- run:
name: test:e2e:firefox
- command: npm run test:e2e:firefox
+ command: npm run build:test && npm run test:e2e:chrome
+ no_output_timeout: 20m
- store_artifacts:
path: test-artifacts
destination: test-artifacts
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 0c6327f6e..47432c1e2 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -25,10 +25,18 @@ const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET]
const env = process.env.METAMASK_ENV
const METAMASK_DEBUG = process.env.METAMASK_DEBUG
-const testMode = (METAMASK_DEBUG || env === 'test')
+
+let defaultProviderConfigType
+if (process.env.IN_TEST === 'true') {
+ defaultProviderConfigType = LOCALHOST
+} else if (METAMASK_DEBUG || env === 'test') {
+ defaultProviderConfigType = RINKEBY
+} else {
+ defaultProviderConfigType = MAINNET
+}
const defaultProviderConfig = {
- type: testMode ? RINKEBY : MAINNET,
+ type: defaultProviderConfigType,
}
const defaultNetworkConfig = {
diff --git a/gulpfile.js b/gulpfile.js
index c1012d5aa..caddb620a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -195,6 +195,21 @@ gulp.task('manifest:production', function () {
.pipe(gulp.dest('./dist/', { overwrite: true }))
})
+gulp.task('manifest:testing', function () {
+ return gulp.src([
+ './dist/firefox/manifest.json',
+ './dist/chrome/manifest.json',
+ ], {base: './dist/'})
+
+ // Exclude chromereload script in production:
+ .pipe(jsoneditor(function (json) {
+ json.permissions = [...json.permissions, 'webRequestBlocking']
+ return json
+ }))
+
+ .pipe(gulp.dest('./dist/', { overwrite: true }))
+})
+
gulp.task('copy',
gulp.series(
gulp.parallel(...copyTaskNames),
@@ -212,6 +227,15 @@ gulp.task('dev:copy',
)
)
+gulp.task('test:copy',
+ gulp.series(
+ gulp.parallel(...copyDevTaskNames),
+ 'manifest:chrome',
+ 'manifest:opera',
+ 'manifest:testing'
+ )
+)
+
// scss compilation and autoprefixing tasks
gulp.task('build:scss', createScssBuildTask({
@@ -287,7 +311,9 @@ const buildJsFiles = [
// bundle tasks
createTasksForBuildJsUIDeps({ dependenciesToBundle: uiDependenciesToBundle, filename: 'libs' })
createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:extension:js', devMode: true })
+createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:test-extension:js', devMode: true, testing: 'true' })
createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:extension:js' })
+createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:test:extension:js', testing: 'true' })
function createTasksForBuildJsUIDeps ({ dependenciesToBundle, filename }) {
const destinations = browserPlatforms.map(platform => `./dist/${platform}`)
@@ -310,7 +336,7 @@ function createTasksForBuildJsUIDeps ({ dependenciesToBundle, filename }) {
}
-function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, bundleTaskOpts = {} }) {
+function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, testing, bundleTaskOpts = {} }) {
// inpage must be built before all other scripts:
const rootDir = './app/scripts'
const nonInpageFiles = buildJsFiles.filter(file => file !== 'inpage')
@@ -324,6 +350,7 @@ function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, bu
buildWithFullPaths: devMode,
watch: devMode,
devMode,
+ testing,
}, bundleTaskOpts)
createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1, buildPhase2 })
}
@@ -383,6 +410,18 @@ gulp.task('dev',
)
)
+gulp.task('dev:test',
+ gulp.series(
+ 'clean',
+ 'dev:scss',
+ gulp.parallel(
+ 'dev:test-extension:js',
+ 'test:copy',
+ 'dev:reload'
+ )
+ )
+)
+
gulp.task('dev:extension',
gulp.series(
'clean',
@@ -407,6 +446,19 @@ gulp.task('build',
)
)
+gulp.task('build:test',
+ gulp.series(
+ 'clean',
+ 'build:scss',
+ gulpParallel(
+ 'build:extension:js:uideps',
+ 'build:test:extension:js',
+ 'copy'
+ ),
+ 'manifest:testing'
+ )
+)
+
gulp.task('build:extension',
gulp.series(
'clean',
@@ -460,6 +512,7 @@ function generateBundler (opts, performBundle) {
bundler.transform(envify({
METAMASK_DEBUG: opts.devMode,
NODE_ENV: opts.devMode ? 'development' : 'production',
+ IN_TEST: opts.testing,
PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
}), {
diff --git a/package.json b/package.json
index 873d53222..41d914c09 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,8 @@
"dist": "gulp dist",
"doc": "jsdoc -c development/tools/.jsdoc.json",
"publish-docs": "gh-pages -d docs/jsdocs",
+ "start:test": "gulp dev:test",
+ "build:test": "gulp build:test",
"test": "npm run test:unit && npm run test:integration && npm run lint",
"watch:test:unit": "nodemon --exec \"npm run test:unit\" ./test ./app ./ui",
"test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"",
diff --git a/test/e2e/beta/from-import-beta-ui.spec.js b/test/e2e/beta/from-import-beta-ui.spec.js
index 8aa0fb628..a913caa79 100644
--- a/test/e2e/beta/from-import-beta-ui.spec.js
+++ b/test/e2e/beta/from-import-beta-ui.spec.js
@@ -24,8 +24,8 @@ describe('Using MetaMask with an existing account', function () {
let extensionId
let driver
- const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
- const testAddress = '0xE18035BF8712672935FDB4e5e431b1a0183d2DFC'
+ const testSeedPhrase = 'forum vessel pink push lonely enact gentle tail admit parrot grunt dress'
+ const testAddress = '0x0Cc5261AB8cE458dc977078A3623E2BaDD27afD3'
const testPrivateKey2 = '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6'
const regularDelayMs = 1000
const largeDelayMs = regularDelayMs * 2
@@ -76,7 +76,18 @@ describe('Using MetaMask with an existing account', function () {
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.metametrics + '\')) }); } else if ' +
'(args[0] === "https://dev.blockscale.net/api/gasexpress.json") { return ' +
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.gasExpress + '\')) }); } ' +
- 'return window.origFetch(...args); }'
+ 'return window.origFetch(...args); };' +
+ 'function cancelInfuraRequest(requestDetails) {' +
+ 'console.log("Canceling: " + requestDetails.url);' +
+ 'return {' +
+ 'cancel: true' +
+ '};' +
+ ' }' +
+ 'window.chrome && window.chrome.webRequest && window.chrome.webRequest.onBeforeRequest.addListener(' +
+ 'cancelInfuraRequest,' +
+ '{urls: ["https://*.infura.io/*"]},' +
+ '["blocking"]' +
+ ');'
)
})
@@ -301,7 +312,7 @@ describe('Using MetaMask with an existing account', function () {
it('should show the correct account name', async () => {
const [accountName] = await findElements(driver, By.css('.account-name'))
- assert.equal(await accountName.getText(), 'Account 3')
+ assert.equal(await accountName.getText(), 'Account 4')
await delay(regularDelayMs)
})
diff --git a/test/e2e/beta/metamask-beta-responsive-ui.spec.js b/test/e2e/beta/metamask-beta-responsive-ui.spec.js
index 6df1da051..b1ed8536e 100644
--- a/test/e2e/beta/metamask-beta-responsive-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-responsive-ui.spec.js
@@ -75,7 +75,18 @@ describe('MetaMask', function () {
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.metametrics + '\')) }); } else if ' +
'(args[0] === "https://dev.blockscale.net/api/gasexpress.json") { return ' +
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.gasExpress + '\')) }); } ' +
- 'return window.origFetch(...args); }'
+ 'return window.origFetch(...args); };' +
+ 'function cancelInfuraRequest(requestDetails) {' +
+ 'console.log("Canceling: " + requestDetails.url);' +
+ 'return {' +
+ 'cancel: true' +
+ '};' +
+ ' }' +
+ 'window.chrome && window.chrome.webRequest && window.chrome.webRequest.onBeforeRequest.addListener(' +
+ 'cancelInfuraRequest,' +
+ '{urls: ["https://*.infura.io/*"]},' +
+ '["blocking"]' +
+ ');'
)
})
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js
index 2700d1656..3b74d6fe0 100644
--- a/test/e2e/beta/metamask-beta-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-ui.spec.js
@@ -80,7 +80,18 @@ describe('MetaMask', function () {
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.metametrics + '\')) }); } else if ' +
'(args[0] === "https://dev.blockscale.net/api/gasexpress.json") { return ' +
'Promise.resolve({ json: () => Promise.resolve(JSON.parse(\'' + fetchMockResponses.gasExpress + '\')) }); } ' +
- 'return window.origFetch(...args); }'
+ 'return window.origFetch(...args); };' +
+ 'function cancelInfuraRequest(requestDetails) {' +
+ 'console.log("Canceling: " + requestDetails.url);' +
+ 'return {' +
+ 'cancel: true' +
+ '};' +
+ ' }' +
+ 'window.chrome && window.chrome.webRequest && window.chrome.webRequest.onBeforeRequest.addListener(' +
+ 'cancelInfuraRequest,' +
+ '{urls: ["https://*.infura.io/*"]},' +
+ '["blocking"]' +
+ ');'
)
})
@@ -223,26 +234,6 @@ describe('MetaMask', function () {
})
})
- describe('Enable privacy mode', () => {
- it('enables privacy mode', async () => {
- const networkDropdown = await findElement(driver, By.css('.network-name'))
- await networkDropdown.click()
- await delay(regularDelayMs)
-
- const customRpcButton = await findElement(driver, By.xpath(`//span[contains(text(), 'Custom RPC')]`))
- await customRpcButton.click()
- await delay(regularDelayMs)
-
- const securityTab = await findElement(driver, By.xpath(`//div[contains(text(), 'Security & Privacy')]`))
- await securityTab.click()
- await delay(regularDelayMs)
-
- const privacyToggle = await findElement(driver, By.css('.settings-page__content-row:nth-of-type(1) .settings-page__content-item-col > div'))
- await privacyToggle.click()
- await delay(largeDelayMs * 2)
- })
- })
-
describe('Log out an log back in', () => {
it('logs out of the account', async () => {
await driver.findElement(By.css('.account-menu__icon')).click()
@@ -318,16 +309,6 @@ describe('MetaMask', function () {
await delay(regularDelayMs)
})
- it('switches to localhost', async () => {
- const networkDropdown = await findElement(driver, By.css('.network-name'))
- await networkDropdown.click()
- await delay(regularDelayMs)
-
- const [localhost] = await findElements(driver, By.xpath(`//span[contains(text(), 'Localhost')]`))
- await localhost.click()
- await delay(largeDelayMs * 2)
- })
-
it('balance renders', async () => {
const balance = await findElement(driver, By.css('.balance-display .token-amount'))
await driver.wait(until.elementTextMatches(balance, /100\s*ETH/))
@@ -611,9 +592,16 @@ describe('MetaMask', function () {
await driver.switchTo().window(extension)
await delay(regularDelayMs)
- const transactions = await findElements(driver, By.css('.transaction-list-item'))
+ let transactions = await findElements(driver, By.css('.transaction-list-item'))
await transactions[3].click()
await delay(regularDelayMs)
+ try {
+ transactions = await findElements(driver, By.css('.transaction-list-item'), 1000)
+ await transactions[3].click()
+ } catch (e) {
+ console.log(e)
+ }
+ await delay(regularDelayMs)
})
it('navigates the transactions', async () => {
@@ -1015,11 +1003,13 @@ describe('MetaMask', function () {
const functionType = await findElement(driver, By.css('.confirm-page-container-content__function-type'))
const functionTypeText = await functionType.getText()
- assert.equal(functionTypeText, 'Transfer')
+ assert.equal(functionTypeText, 'Not Found')
const confirmDataDiv = await findElement(driver, By.css('.confirm-page-container-content__data-box'))
const confirmDataText = await confirmDataDiv.getText()
- assert.equal(confirmDataText.match(/0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97/))
+
+ await delay(regularDelayMs)
+ assert(confirmDataText.match(/0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97/))
const detailsTab = await findElement(driver, By.xpath(`//li[contains(text(), 'Details')]`))
detailsTab.click()
@@ -1050,8 +1040,7 @@ describe('MetaMask', function () {
return confirmedTxes.length === 1
}, 10000)
const txStatuses = await findElements(driver, By.css('.transaction-list-item__action'))
- const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Sent\sToken|Failed/), 10000)
- assert.equal(await tx.getText(), 'Sent Tokens')
+ await driver.wait(until.elementTextMatches(txStatuses[0], /Contract\sInteraction/i), 10000)
})
})
@@ -1135,7 +1124,7 @@ describe('MetaMask', function () {
const txValues = await findElements(driver, By.css('.transaction-list-item__amount--primary'))
await driver.wait(until.elementTextMatches(txValues[0], /-7\s*TST/))
const txStatuses = await findElements(driver, By.css('.transaction-list-item__action'))
- await driver.wait(until.elementTextMatches(txStatuses[0], /Sent\sToken/), 10000)
+ await driver.wait(until.elementTextMatches(txStatuses[0], /Contract\sInteraction/), 10000)
const walletBalance = await findElement(driver, By.css('.wallet-balance'))
await walletBalance.click()
@@ -1153,7 +1142,7 @@ describe('MetaMask', function () {
})
})
- describe('Approves a custom token from dapp', () => {
+ describe.skip('Approves a custom token from dapp', () => {
let gasModal
it('approves an already created token', async () => {
const windowHandles = await driver.getAllWindowHandles()
@@ -1191,7 +1180,7 @@ describe('MetaMask', function () {
const functionType = await findElement(driver, By.css('.confirm-page-container-content__function-type'))
const functionTypeText = await functionType.getText()
- assert.equal(functionTypeText, 'Approve')
+ assert.equal(functionTypeText, 'Not Found')
const confirmDataDiv = await findElement(driver, By.css('.confirm-page-container-content__data-box'))
const confirmDataText = await confirmDataDiv.getText()
@@ -1318,10 +1307,10 @@ describe('MetaMask', function () {
describe('Stores custom RPC history', () => {
const customRpcUrls = [
- 'https://mainnet.infura.io/1',
- 'https://mainnet.infura.io/2',
- 'https://mainnet.infura.io/3',
- 'https://mainnet.infura.io/4',
+ 'http://127.0.0.1:8545/1',
+ 'http://127.0.0.1:8545/2',
+ 'http://127.0.0.1:8545/3',
+ 'http://127.0.0.1:8545/4',
]
customRpcUrls.forEach(customRpcUrl => {
@@ -1360,7 +1349,7 @@ describe('MetaMask', function () {
await delay(regularDelayMs)
// only recent 3 are found and in correct order (most recent at the top)
- const customRpcs = await findElements(driver, By.xpath(`//span[contains(text(), 'https://mainnet.infura.io/')]`))
+ const customRpcs = await findElements(driver, By.xpath(`//span[contains(text(), 'http://127.0.0.1:8545/')]`))
assert.equal(customRpcs.length, customRpcUrls.length)
})
diff --git a/test/e2e/beta/run-all.sh b/test/e2e/beta/run-all.sh
index f2705da4c..685feab00 100755
--- a/test/e2e/beta/run-all.sh
+++ b/test/e2e/beta/run-all.sh
@@ -8,4 +8,5 @@ export PATH="$PATH:./node_modules/.bin"
shell-parallel -s 'npm run ganache:start -- -b 2' -x 'sleep 5 && static-server test/e2e/beta/contract-test --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec'
shell-parallel -s 'npm run ganache:start -- -b 2' -x 'sleep 5 && static-server test/e2e/beta/contract-test --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-responsive-ui.spec'
-shell-parallel -s 'npm run ganache:start -- -d -b 2' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec'
+shell-parallel -s 'npm run ganache:start -- -d -b 2 --account=0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9,25000000000000000000' \
+ -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec'
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 15:30:29 +0800