diff options
| -rw-r--r-- | app/scripts/notice-controller.js | 2 | ||||
| -rw-r--r-- | notices/notices.js | 2 | ||||
| -rw-r--r-- | test/e2e/beta/metamask-beta-ui.spec.js | 16 | ||||
| -rw-r--r-- | test/e2e/metamask.spec.js | 24 |
4 files changed, 29 insertions, 15 deletions
diff --git a/app/scripts/notice-controller.js b/app/scripts/notice-controller.js index 635922104..5cbc14c78 100644 --- a/app/scripts/notice-controller.js +++ b/app/scripts/notice-controller.js @@ -13,7 +13,7 @@ module.exports = class NoticeController extends EventEmitter { this.firstVersion = opts.firstVersion this.version = opts.version const initState = extend({ - noticesList: hardCodedNotices, + noticesList: this._filterNotices(hardCodedNotices), }, opts.initState) this.store = new ObservableStore(initState) this.memStore = new ObservableStore({}) diff --git a/notices/notices.js b/notices/notices.js index fb2d9cdb5..4ba925408 100644 --- a/notices/notices.js +++ b/notices/notices.js @@ -28,7 +28,7 @@ module.exports = [ id: 4, read: false, date: 'Wed Jun 13 2018', - title: 'Concerning Recent Phishing Incidents', + title: 'Phishing Warning', body: fs.readFileSync(__dirname + '/archive/notice_4.md', 'utf8'), } ] diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js index ceeea31a5..0d304cf14 100644 --- a/test/e2e/beta/metamask-beta-ui.spec.js +++ b/test/e2e/beta/metamask-beta-ui.spec.js @@ -129,19 +129,25 @@ describe('MetaMask', function () { }) it('clicks through the privacy notice', async () => { - const nextScreen = await findElement(driver, By.css('.tou button')) - await nextScreen.click() - await delay(regularDelayMs) - + // terms of use const canClickThrough = await driver.findElement(By.css('.tou button')).isEnabled() assert.equal(canClickThrough, false, 'disabled continue button') const bottomOfTos = await findElement(driver, By.linkText('Attributions')) await driver.executeScript('arguments[0].scrollIntoView(true)', bottomOfTos) await delay(regularDelayMs) - const acceptTos = await findElement(driver, By.css('.tou button')) await acceptTos.click() await delay(regularDelayMs) + + // privacy notice + const nextScreen = await findElement(driver, By.css('.tou button')) + await nextScreen.click() + await delay(regularDelayMs) + + // phishing notice + const nextScreen = await findElement(driver, By.css('.tou button')) + await nextScreen.click() + await delay(regularDelayMs) }) let seedPhrase diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js index a08a34d96..fb7e083c3 100644 --- a/test/e2e/metamask.spec.js +++ b/test/e2e/metamask.spec.js @@ -73,14 +73,6 @@ describe('Metamask popup page', function () { assert.equal(title, 'MetaMask', 'title matches MetaMask') }) - it('shows privacy notice', async () => { - await delay(300) - const privacy = await driver.findElement(By.css('.terms-header')).getText() - assert.equal(privacy, 'PRIVACY NOTICE', 'shows privacy notice') - await driver.findElement(By.css('button')).click() - await delay(300) - }) - it('show terms of use', async () => { const terms = await driver.findElement(By.css('.terms-header')).getText() assert.equal(terms, 'TERMS OF USE', 'shows terms of use') @@ -100,6 +92,22 @@ describe('Metamask popup page', function () { await button.click() }) + it('shows privacy notice', async () => { + await delay(300) + const privacy = await driver.findElement(By.css('.terms-header')).getText() + assert.equal(privacy, 'PRIVACY NOTICE', 'shows privacy notice') + await driver.findElement(By.css('button')).click() + await delay(300) + }) + + it('shows phishing notice', async () => { + await delay(300) + const noticeHeader = await driver.findElement(By.css('.terms-header')).getText() + assert.equal(noticeHeader, 'PHISHING WARNING', 'shows phishing warning') + await driver.findElement(By.css('button')).click() + await delay(300) + }) + it('accepts password with length of eight', async () => { const passwordBox = await driver.findElement(By.id('password-box')) const passwordBoxConfirm = await driver.findElement(By.id('password-box-confirm')) |