From a46ec83c9b258a3aed65e1ef08769300c01ca13b Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 1 Apr 2019 20:03:54 -0500 Subject: Remove NoticeController (#6382) --- .../unit/app/controllers/notice-controller-test.js | 92 ---------------------- test/unit/migrations/033-test.js | 40 ++++++++++ test/unit/ui/app/actions.spec.js | 54 +------------ test/unit/ui/app/reducers/app.spec.js | 9 --- test/unit/ui/app/reducers/metamask.spec.js | 43 ---------- 5 files changed, 42 insertions(+), 196 deletions(-) delete mode 100644 test/unit/app/controllers/notice-controller-test.js create mode 100644 test/unit/migrations/033-test.js (limited to 'test/unit') diff --git a/test/unit/app/controllers/notice-controller-test.js b/test/unit/app/controllers/notice-controller-test.js deleted file mode 100644 index caa50a03e..000000000 --- a/test/unit/app/controllers/notice-controller-test.js +++ /dev/null @@ -1,92 +0,0 @@ -const assert = require('assert') -const NoticeController = require('../../../../app/scripts/notice-controller') - -describe('notice-controller', function () { - var noticeController - - beforeEach(function () { - noticeController = new NoticeController() - }) - - describe('notices', function () { - - describe('#setNoticesList', function () { - it('should set data appropriately', function (done) { - var testList = [{ - id: 0, - read: false, - title: 'Futuristic Notice', - }] - noticeController.setNoticesList(testList) - var testListId = noticeController.getNoticesList()[0].id - assert.equal(testListId, 0) - done() - }) - }) - - describe('#markNoticeRead', function () { - it('should mark a notice as read', function (done) { - var testList = [{ - id: 0, - read: false, - title: 'Futuristic Notice', - }] - noticeController.setNoticesList(testList) - noticeController.markNoticeRead(testList[0]) - var newList = noticeController.getNoticesList() - assert.ok(newList[0].read) - done() - }) - }) - - describe('#markAllNoticesRead', () => { - it('marks all notices read', async () => { - const testList = [{ - id: 0, - read: false, - title: 'Notice 1', - }, { - id: 1, - read: false, - title: 'Notice 2', - }, { - id: 2, - read: false, - title: 'Notice 3', - }] - - noticeController.setNoticesList(testList) - - noticeController.markAllNoticesRead() - - const unreadNotices = noticeController.getUnreadNotices() - assert.equal(unreadNotices.length, 0) - }) - }) - - describe('#getNextUnreadNotice', function () { - it('should retrieve the latest unread notice', function (done) { - var testList = [ - {id: 0, read: true, title: 'Past Notice'}, - {id: 1, read: false, title: 'Current Notice'}, - {id: 2, read: false, title: 'Future Notice'}, - ] - noticeController.setNoticesList(testList) - var latestUnread = noticeController.getNextUnreadNotice() - assert.equal(latestUnread.id, 1) - done() - }) - it('should return undefined if no unread notices exist.', function (done) { - var testList = [ - {id: 0, read: true, title: 'Past Notice'}, - {id: 1, read: true, title: 'Current Notice'}, - {id: 2, read: true, title: 'Future Notice'}, - ] - noticeController.setNoticesList(testList) - var latestUnread = noticeController.getNextUnreadNotice() - assert.ok(!latestUnread) - done() - }) - }) - }) -}) diff --git a/test/unit/migrations/033-test.js b/test/unit/migrations/033-test.js new file mode 100644 index 000000000..b111198fd --- /dev/null +++ b/test/unit/migrations/033-test.js @@ -0,0 +1,40 @@ +const assert = require('assert') +const migration33 = require('../../../app/scripts/migrations/033') + +describe('Migration to delete notice controller', () => { + const oldStorage = { + 'meta': {}, + 'data': { + 'NoticeController': { + 'noticesList': [ + { + id: 0, + read: false, + date: 'Thu Feb 09 2017', + title: 'Terms of Use', + body: 'notice body', + }, + { + id: 2, + read: false, + title: 'Privacy Notice', + body: 'notice body', + }, + { + id: 4, + read: false, + title: 'Phishing Warning', + body: 'notice body', + }, + ], + }, + }, + } + + it('removes notice controller from state', () => { + migration33.migrate(oldStorage) + .then(newStorage => { + assert.equal(newStorage.data.NoticeController, undefined) + }) + }) +}) diff --git a/test/unit/ui/app/actions.spec.js b/test/unit/ui/app/actions.spec.js index a578ec89c..86c3f8aff 100644 --- a/test/unit/ui/app/actions.spec.js +++ b/test/unit/ui/app/actions.spec.js @@ -1031,52 +1031,6 @@ describe('Actions', () => { }) }) - describe('#markNoticeRead', () => { - let markNoticeReadSpy - const notice = { - id: 0, - read: false, - date: 'test date', - title: 'test title', - body: 'test body', - } - - beforeEach(() => { - markNoticeReadSpy = sinon.stub(background, 'markNoticeRead') - }) - - afterEach(() => { - markNoticeReadSpy.restore() - }) - - it('calls markNoticeRead in background', () => { - const store = mockStore() - - store.dispatch(actions.markNoticeRead(notice)) - .then(() => { - assert(markNoticeReadSpy.calledOnce) - }) - - }) - - it('errors when markNoticeRead in background throws', () => { - const store = mockStore() - const expectedActions = [ - { type: 'SHOW_LOADING_INDICATION', value: undefined }, - { type: 'HIDE_LOADING_INDICATION' }, - { type: 'DISPLAY_WARNING', value: 'error' }, - ] - markNoticeReadSpy.callsFake((notice, callback) => { - callback(new Error('error')) - }) - - store.dispatch(actions.markNoticeRead()) - .catch(() => { - assert.deepEqual(store.getActions(), expectedActions) - }) - }) - }) - describe('#setProviderType', () => { let setProviderTypeSpy let store @@ -1309,24 +1263,20 @@ describe('Actions', () => { }) describe('#setCompletedOnboarding', () => { - let markAllNoticesReadSpy, completeOnboardingSpy + let completeOnboardingSpy beforeEach(() => { - markAllNoticesReadSpy = sinon.stub(background, 'markAllNoticesRead') - markAllNoticesReadSpy.callsFake(cb => cb()) completeOnboardingSpy = sinon.stub(background, 'completeOnboarding') completeOnboardingSpy.callsFake(cb => cb()) }) after(() => { - markAllNoticesReadSpy.restore() completeOnboardingSpy.restore() }) - it('completing onboarding marks all notices as read', async () => { + it('completes onboarding', async () => { const store = mockStore() await store.dispatch(actions.setCompletedOnboarding()) - assert.equal(markAllNoticesReadSpy.callCount, 1) assert.equal(completeOnboardingSpy.callCount, 1) }) }) diff --git a/test/unit/ui/app/reducers/app.spec.js b/test/unit/ui/app/reducers/app.spec.js index 6c77e0ef9..09cf3dbf0 100644 --- a/test/unit/ui/app/reducers/app.spec.js +++ b/test/unit/ui/app/reducers/app.spec.js @@ -445,15 +445,6 @@ describe('App State', () => { assert.equal(state.forgottenPassword, false) }) - it('shows notice', () => { - const state = reduceApp(metamaskState, { - type: actions.SHOW_NOTICE, - }) - - assert.equal(state.transForward, true) - assert.equal(state.isLoading, false) - }) - it('reveals account', () => { const state = reduceApp(metamaskState, { type: actions.REVEAL_ACCOUNT, diff --git a/test/unit/ui/app/reducers/metamask.spec.js b/test/unit/ui/app/reducers/metamask.spec.js index 388c67c76..d7876bf39 100644 --- a/test/unit/ui/app/reducers/metamask.spec.js +++ b/test/unit/ui/app/reducers/metamask.spec.js @@ -35,49 +35,6 @@ describe('MetaMask Reducers', () => { assert.equal(state.isRevealingSeedWords, false) }) - it('shows notice', () => { - const notice = { - id: 0, - read: false, - date: 'Date', - title: 'Title', - body: 'Body', - } - - const state = reduceMetamask({}, { - type: actions.SHOW_NOTICE, - value: notice, - }) - - assert.equal(state.noActiveNotices, false) - assert.equal(state.nextUnreadNotice, notice) - }) - - it('clears notice', () => { - - const notice = { - id: 0, - read: false, - date: 'Date', - title: 'Title', - body: 'Body', - } - - const noticesState = { - metamask: { - noActiveNotices: false, - nextUnreadNotice: notice, - }, - } - - const state = reduceMetamask(noticesState, { - type: actions.CLEAR_NOTICES, - }) - - assert.equal(state.noActiveNotices, true) - assert.equal(state.nextUnreadNotice, null) - }) - it('unlocks MetaMask', () => { const state = reduceMetamask({}, { type: actions.UNLOCK_METAMASK, -- cgit