From fca2b756c2bbef444584cdb33d78fc5a15b2e718 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Mon, 10 Apr 2017 16:54:01 +0200 Subject: [PATCH] Moved url bar related files into app folder Resolves #8188 Auditors: @bridiver Test Plan: - all test should be green --- .../components/navigation}/navigationBar.js | 38 +++++++++---------- .../components/{ => navigation}/urlBar.js | 34 ++++++++--------- .../components/{ => navigation}/urlBarIcon.js | 18 ++++----- .../{ => navigation}/urlBarSuggestionItem.js | 6 +-- .../{ => navigation}/urlBarSuggestions.js | 12 +++--- js/components/main.js | 2 +- test/unit/app/browser/exportBookmarksTest.js | 4 +- .../navigation}/navigationBarTest.js | 8 ++-- .../{ => navigation}/urlBarIconTest.js | 8 ++-- .../urlBarSuggestionItemTest.js | 8 ++-- .../components/{ => navigation}/urlBarTest.js | 8 ++-- test/unit/js/components/mainTest.js | 2 +- 12 files changed, 74 insertions(+), 74 deletions(-) rename {js/components => app/renderer/components/navigation}/navigationBar.js (88%) rename app/renderer/components/{ => navigation}/urlBar.js (94%) rename app/renderer/components/{ => navigation}/urlBarIcon.js (84%) rename app/renderer/components/{ => navigation}/urlBarSuggestionItem.js (87%) rename app/renderer/components/{ => navigation}/urlBarSuggestions.js (91%) rename test/unit/{js/components => app/renderer/components/navigation}/navigationBarTest.js (90%) rename test/unit/app/renderer/components/{ => navigation}/urlBarIconTest.js (88%) rename test/unit/app/renderer/components/{ => navigation}/urlBarSuggestionItemTest.js (90%) rename test/unit/app/renderer/components/{ => navigation}/urlBarTest.js (89%) diff --git a/js/components/navigationBar.js b/app/renderer/components/navigation/navigationBar.js similarity index 88% rename from js/components/navigationBar.js rename to app/renderer/components/navigation/navigationBar.js index 0ad4068fa57..c95433c1d74 100644 --- a/js/components/navigationBar.js +++ b/app/renderer/components/navigation/navigationBar.js @@ -4,27 +4,27 @@ const React = require('react') const Immutable = require('immutable') -const ImmutableComponent = require('./immutableComponent') +const ImmutableComponent = require('./../../../../js/components/immutableComponent') -const cx = require('../lib/classSet') -const Button = require('./button') -const UrlBar = require('../../app/renderer/components/urlBar') -const windowActions = require('../actions/windowActions') -const appActions = require('../actions/appActions') -const siteTags = require('../constants/siteTags') -const messages = require('../constants/messages') -const settings = require('../constants/settings') +const cx = require('../../../../js/lib/classSet') +const Button = require('./../../../../js/components/button') +const UrlBar = require('./urlBar') +const windowActions = require('../../../../js/actions/windowActions') +const appActions = require('../../../../js/actions/appActions') +const siteTags = require('../../../../js/constants/siteTags') +const messages = require('../../../../js/constants/messages') +const settings = require('../../../../js/constants/settings') const ipc = require('electron').ipcRenderer -const {isSourceAboutUrl, getBaseUrl} = require('../lib/appUrlUtil') -const AddEditBookmarkHanger = require('../../app/renderer/components/addEditBookmarkHanger') -const siteUtil = require('../state/siteUtil') -const eventUtil = require('../lib/eventUtil') -const UrlUtil = require('../lib/urlutil') -const getSetting = require('../settings').getSetting -const windowStore = require('../stores/windowStore') -const contextMenus = require('../contextMenus') -const LongPressButton = require('./longPressButton') -const PublisherToggle = require('../../app/renderer/components/publisherToggle') +const {isSourceAboutUrl, getBaseUrl} = require('../../../../js/lib/appUrlUtil') +const AddEditBookmarkHanger = require('../addEditBookmarkHanger') +const siteUtil = require('../../../../js/state/siteUtil') +const eventUtil = require('../../../../js/lib/eventUtil') +const UrlUtil = require('../../../../js/lib/urlutil') +const getSetting = require('../../../../js/settings').getSetting +const windowStore = require('../../../../js/stores/windowStore') +const contextMenus = require('../../../../js/contextMenus') +const LongPressButton = require('./../../../../js/components/longPressButton') +const PublisherToggle = require('../publisherToggle') class NavigationBar extends ImmutableComponent { constructor () { diff --git a/app/renderer/components/urlBar.js b/app/renderer/components/navigation/urlBar.js similarity index 94% rename from app/renderer/components/urlBar.js rename to app/renderer/components/navigation/urlBar.js index 0da769acdc0..8756d7c3f40 100644 --- a/app/renderer/components/urlBar.js +++ b/app/renderer/components/navigation/urlBar.js @@ -3,26 +3,26 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ const React = require('react') -const urlParse = require('../../common/urlParse') - -const ImmutableComponent = require('../../../js/components/immutableComponent') -const windowActions = require('../../../js/actions/windowActions') -const appActions = require('../../../js/actions/appActions') -const KeyCodes = require('../../common/constants/keyCodes') -const cx = require('../../../js/lib/classSet') -const debounce = require('../../../js/lib/debounce') +const urlParse = require('../../../common/urlParse') + +const ImmutableComponent = require('../../../../js/components/immutableComponent') +const windowActions = require('../../../../js/actions/windowActions') +const appActions = require('../../../../js/actions/appActions') +const KeyCodes = require('../../../common/constants/keyCodes') +const cx = require('../../../../js/lib/classSet') +const debounce = require('../../../../js/lib/debounce') const ipc = require('electron').ipcRenderer const UrlBarSuggestions = require('./urlBarSuggestions') const UrlBarIcon = require('./urlBarIcon') -const messages = require('../../../js/constants/messages') -const {getSetting} = require('../../../js/settings') -const settings = require('../../../js/constants/settings') -const contextMenus = require('../../../js/contextMenus') -const windowStore = require('../../../js/stores/windowStore') -const UrlUtil = require('../../../js/lib/urlutil') -const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../js/lib/eventUtil') -const {isUrl, isIntermediateAboutPage} = require('../../../js/lib/appUrlUtil') +const messages = require('../../../../js/constants/messages') +const {getSetting} = require('../../../../js/settings') +const settings = require('../../../../js/constants/settings') +const contextMenus = require('../../../../js/contextMenus') +const windowStore = require('../../../../js/stores/windowStore') +const UrlUtil = require('../../../../js/lib/urlutil') +const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../../js/lib/eventUtil') +const {isUrl, isIntermediateAboutPage} = require('../../../../js/lib/appUrlUtil') class UrlBar extends ImmutableComponent { constructor () { @@ -104,7 +104,7 @@ class UrlBar extends ImmutableComponent { getPlatformClientId (provider) { try { if (provider.get('platformClientId')) { - const platformUtil = require('../../common/lib/platformUtil') + const platformUtil = require('../../../common/lib/platformUtil') if (platformUtil.isWindows()) { return provider.getIn(['platformClientId', 'win32']) || '' } else if (platformUtil.isDarwin()) { diff --git a/app/renderer/components/urlBarIcon.js b/app/renderer/components/navigation/urlBarIcon.js similarity index 84% rename from app/renderer/components/urlBarIcon.js rename to app/renderer/components/navigation/urlBarIcon.js index c4a5a4f70a4..e8ec0bed4cd 100644 --- a/app/renderer/components/urlBarIcon.js +++ b/app/renderer/components/navigation/urlBarIcon.js @@ -3,15 +3,15 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ const React = require('react') -const ImmutableComponent = require('../../../js/components/immutableComponent') -const windowActions = require('../../../js/actions/windowActions') -const cx = require('../../../js/lib/classSet') -const dragTypes = require('../../../js/constants/dragTypes') -const dndData = require('../../../js/dndData') -const {isSourceAboutUrl} = require('../../../js/lib/appUrlUtil') -const {isPotentialPhishingUrl} = require('../../../js/lib/urlutil') -const windowStore = require('../../../js/stores/windowStore') -const {getActiveFrame} = require('../../../js/state/frameStateUtil') +const ImmutableComponent = require('../../../../js/components/immutableComponent') +const windowActions = require('../../../../js/actions/windowActions') +const cx = require('../../../../js/lib/classSet') +const dragTypes = require('../../../../js/constants/dragTypes') +const dndData = require('../../../../js/dndData') +const {isSourceAboutUrl} = require('../../../../js/lib/appUrlUtil') +const {isPotentialPhishingUrl} = require('../../../../js/lib/urlutil') +const windowStore = require('../../../../js/stores/windowStore') +const {getActiveFrame} = require('../../../../js/state/frameStateUtil') const searchIconSize = 16 class UrlBarIcon extends ImmutableComponent { diff --git a/app/renderer/components/urlBarSuggestionItem.js b/app/renderer/components/navigation/urlBarSuggestionItem.js similarity index 87% rename from app/renderer/components/urlBarSuggestionItem.js rename to app/renderer/components/navigation/urlBarSuggestionItem.js index 2cc98535376..c2b592d7d61 100644 --- a/app/renderer/components/urlBarSuggestionItem.js +++ b/app/renderer/components/navigation/urlBarSuggestionItem.js @@ -3,9 +3,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ const React = require('react') -const ImmutableComponent = require('../../../js/components/immutableComponent') -const suggestionTypes = require('../../../js/constants/suggestionTypes') -const cx = require('../../../js/lib/classSet') +const ImmutableComponent = require('../../../../js/components/immutableComponent') +const suggestionTypes = require('../../../../js/constants/suggestionTypes') +const cx = require('../../../../js/lib/classSet') class UrlBarSuggestionItem extends ImmutableComponent { componentDidMount () { diff --git a/app/renderer/components/urlBarSuggestions.js b/app/renderer/components/navigation/urlBarSuggestions.js similarity index 91% rename from app/renderer/components/urlBarSuggestions.js rename to app/renderer/components/navigation/urlBarSuggestions.js index 1254a84eb71..7b35a1095c6 100644 --- a/app/renderer/components/urlBarSuggestions.js +++ b/app/renderer/components/navigation/urlBarSuggestions.js @@ -3,14 +3,14 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ const React = require('react') -const ImmutableComponent = require('../../../js/components/immutableComponent') +const ImmutableComponent = require('../../../../js/components/immutableComponent') const UrlBarSuggestionItem = require('./urlBarSuggestionItem') -const windowActions = require('../../../js/actions/windowActions') -const suggestionTypes = require('../../../js/constants/suggestionTypes') -const cx = require('../../../js/lib/classSet') -const locale = require('../../../js/l10n') -const {isForSecondaryAction} = require('../../../js/lib/eventUtil') +const windowActions = require('../../../../js/actions/windowActions') +const suggestionTypes = require('../../../../js/constants/suggestionTypes') +const cx = require('../../../../js/lib/classSet') +const locale = require('../../../../js/l10n') +const {isForSecondaryAction} = require('../../../../js/lib/eventUtil') class UrlBarSuggestions extends ImmutableComponent { constructor () { diff --git a/js/components/main.js b/js/components/main.js index 6188613f946..5395c3bb040 100644 --- a/js/components/main.js +++ b/js/components/main.js @@ -18,7 +18,7 @@ const contextMenus = require('../contextMenus') const getSetting = require('../settings').getSetting // Components -const NavigationBar = require('./navigationBar') +const NavigationBar = require('./../../app/renderer/components/navigation/navigationBar') const Frame = require('./frame') const TabPages = require('./tabPages') const TabsToolbar = require('./tabsToolbar') diff --git a/test/unit/app/browser/exportBookmarksTest.js b/test/unit/app/browser/exportBookmarksTest.js index 34a55944b0d..c420cf2821d 100644 --- a/test/unit/app/browser/exportBookmarksTest.js +++ b/test/unit/app/browser/exportBookmarksTest.js @@ -113,8 +113,8 @@ describe('Bookmarks export', function () { let result = exporter.createBookmarkHTML(personal, other) let expected = fs.readFileSync('./test/fixtures/bookmarkExport.html', 'utf8') - result = result.replace(/\s+/g,' ') - expected = expected.replace(/\s+/g,' ') + result = result.replace(/\s+/g, ' ') + expected = expected.replace(/\s+/g, ' ') assert.equal(result, expected) }) diff --git a/test/unit/js/components/navigationBarTest.js b/test/unit/app/renderer/components/navigation/navigationBarTest.js similarity index 90% rename from test/unit/js/components/navigationBarTest.js rename to test/unit/app/renderer/components/navigation/navigationBarTest.js index 9ceae180142..4d39274a56d 100644 --- a/test/unit/js/components/navigationBarTest.js +++ b/test/unit/app/renderer/components/navigation/navigationBarTest.js @@ -9,7 +9,7 @@ const {shallow} = require('enzyme') const assert = require('assert') const Immutable = require('immutable') let NavigationBar, UrlBar -require('../../braveUnit') +require('../../../../braveUnit') describe('NavigationBar component unit tests', function () { before(function () { @@ -22,9 +22,9 @@ describe('NavigationBar component unit tests', function () { mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg', {}) mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg', {}) mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg', {}) - mockery.registerMock('electron', require('../../lib/fakeElectron')) - NavigationBar = require('../../../../js/components/navigationBar') - UrlBar = require('../../../../app/renderer/components/urlBar') + mockery.registerMock('electron', require('../../../../lib/fakeElectron')) + NavigationBar = require('../../../../../../app/renderer/components/navigation/navigationBar') + UrlBar = require('../../../../../../app/renderer/components/navigation/urlBar') }) after(function () { diff --git a/test/unit/app/renderer/components/urlBarIconTest.js b/test/unit/app/renderer/components/navigation/urlBarIconTest.js similarity index 88% rename from test/unit/app/renderer/components/urlBarIconTest.js rename to test/unit/app/renderer/components/navigation/urlBarIconTest.js index 298d308d812..199727ebf3a 100644 --- a/test/unit/app/renderer/components/urlBarIconTest.js +++ b/test/unit/app/renderer/components/navigation/urlBarIconTest.js @@ -9,7 +9,7 @@ const {mount} = require('enzyme') const sinon = require('sinon') const assert = require('assert') let UrlBarIcon, windowActions -require('../../../braveUnit') +require('../../../../braveUnit') describe('UrlBarIcon component unit tests', function () { before(function () { @@ -18,9 +18,9 @@ describe('UrlBarIcon component unit tests', function () { warnOnUnregistered: false, useCleanCache: true }) - mockery.registerMock('electron', require('../../../lib/fakeElectron')) - UrlBarIcon = require('../../../../../app/renderer/components/urlBarIcon') - windowActions = require('../../../../../js/actions/windowActions') + mockery.registerMock('electron', require('../../../../lib/fakeElectron')) + UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon') + windowActions = require('../../../../../../js/actions/windowActions') }) after(function () { diff --git a/test/unit/app/renderer/components/urlBarSuggestionItemTest.js b/test/unit/app/renderer/components/navigation/urlBarSuggestionItemTest.js similarity index 90% rename from test/unit/app/renderer/components/urlBarSuggestionItemTest.js rename to test/unit/app/renderer/components/navigation/urlBarSuggestionItemTest.js index de42825ab46..a99da2394a3 100644 --- a/test/unit/app/renderer/components/urlBarSuggestionItemTest.js +++ b/test/unit/app/renderer/components/navigation/urlBarSuggestionItemTest.js @@ -7,10 +7,10 @@ const mockery = require('mockery') const {mount} = require('enzyme') const assert = require('assert') const sinon = require('sinon') -const fakeElectron = require('../../../lib/fakeElectron') -const suggestionTypes = require('../../../../../js/constants/suggestionTypes') +const fakeElectron = require('../../../../lib/fakeElectron') +const suggestionTypes = require('../../../../../../js/constants/suggestionTypes') let UrlBarSuggestionItem -require('../../../braveUnit') +require('../../../../braveUnit') describe('UrlBarSuggestionItem component', function () { before(function () { @@ -20,7 +20,7 @@ describe('UrlBarSuggestionItem component', function () { useCleanCache: true }) mockery.registerMock('electron', fakeElectron) - UrlBarSuggestionItem = require('../../../../../app/renderer/components/urlBarSuggestionItem') + UrlBarSuggestionItem = require('../../../../../../app/renderer/components/navigation/urlBarSuggestionItem') }) after(function () { mockery.disable() diff --git a/test/unit/app/renderer/components/urlBarTest.js b/test/unit/app/renderer/components/navigation/urlBarTest.js similarity index 89% rename from test/unit/app/renderer/components/urlBarTest.js rename to test/unit/app/renderer/components/navigation/urlBarTest.js index fa5ea526d5b..f2b3d5b9ea2 100644 --- a/test/unit/app/renderer/components/urlBarTest.js +++ b/test/unit/app/renderer/components/navigation/urlBarTest.js @@ -9,7 +9,7 @@ const {shallow} = require('enzyme') const assert = require('assert') const Immutable = require('immutable') let UrlBar, UrlBarIcon -require('../../../braveUnit') +require('../../../../braveUnit') describe('UrlBar component unit tests', function () { before(function () { @@ -22,9 +22,9 @@ describe('UrlBar component unit tests', function () { mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg', {}) mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg', {}) mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg', {}) - mockery.registerMock('electron', require('../../../lib/fakeElectron')) - UrlBar = require('../../../../../app/renderer/components/urlBar') - UrlBarIcon = require('../../../../../app/renderer/components/urlBarIcon') + mockery.registerMock('electron', require('../../../../lib/fakeElectron')) + UrlBar = require('../../../../../../app/renderer/components/navigation/urlBar') + UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon') }) after(function () { diff --git a/test/unit/js/components/mainTest.js b/test/unit/js/components/mainTest.js index 0ecf982a526..0764974af3b 100644 --- a/test/unit/js/components/mainTest.js +++ b/test/unit/js/components/mainTest.js @@ -25,7 +25,7 @@ describe('Main component unit tests', function () { mockery.registerMock('../../extensions/brave/img/tabs/new_session.svg') mockery.registerMock('electron', require('../../lib/fakeElectron')) Main = require('../../../../js/components/main') - NavigationBar = require('../../../../js/components/navigationBar') + NavigationBar = require('../../../../app/renderer/components/navigation/navigationBar') }) after(function () {