entry.get('site')).includes(this.publisherId)
- }
-
- get enabledForPaymentsPublisher () {
- // All publishers will be enabled by default if AUTO_SUGGEST is ON,
- // excluding publishers defined on ledger's exclusion list
- const excluded = this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'exclude'])
- const autoSuggestSites = getSetting(settings.AUTO_SUGGEST_SITES)
-
- // hostSettings is undefined until user hit addFunds button.
- // For such cases check autoSuggestSites for eligibility.
- return this.hostSettings
- ? this.hostSettings.get('ledgerPayments') !== false
- : this.validPublisherSynopsis || (autoSuggestSites && !excluded)
- }
-
- get verifiedPublisher () {
- return this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'verified'])
- }
-
- get visiblePublisher () {
- // ledgerPaymentsShown is undefined by default until
- // user decide to permanently hide the publisher,
- // so for icon to be shown it can be everything but false
- const ledgerPaymentsShown = this.hostSettings && this.hostSettings.get('ledgerPaymentsShown')
- return typeof ledgerPaymentsShown === 'boolean'
- ? ledgerPaymentsShown
- : true
- }
-
- get shouldShowAddPublisherButton () {
- return getSetting(settings.PAYMENTS_ENABLED) &&
- isHttpOrHttps(this.props.location) &&
- this.visiblePublisher
- }
-
get l10nString () {
let l10nData = 'disabledPublisher'
- if (this.verifiedPublisher && !this.enabledForPaymentsPublisher) {
+ if (this.props.isVerifiedPublisher && !this.props.isEnabledForPaymentsPublisher) {
l10nData = 'verifiedPublisher'
- } else if (this.enabledForPaymentsPublisher) {
+ } else if (this.props.isEnabledForPaymentsPublisher) {
l10nData = 'enabledPublisher'
}
return l10nData
}
onAuthorizePublisher () {
- const hostPattern = getHostPattern(this.publisherId)
- appActions.changeSiteSetting(hostPattern, 'ledgerPayments', !this.enabledForPaymentsPublisher)
+ appActions.changeSiteSetting(this.props.hostPattern, 'ledgerPayments', !this.props.isEnabledForPaymentsPublisher)
+ }
+
+ mergeProps (state, ownProps) {
+ const currentWindow = state.get('currentWindow')
+ const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
+ const location = activeFrame.get('location', '')
+ const locationId = getBaseUrl(location)
+ const locationInfo = state.get('locationInfo', Immutable.Map())
+
+ const props = {}
+ // used in renderer
+ props.isEnabledForPaymentsPublisher = publisherState.enabledForPaymentsPublisher(state, locationId)
+ props.isVerifiedPublisher = locationInfo.getIn([locationId, 'verified'])
+
+ // used in functions
+ props.publisherId = locationInfo.getIn([locationId, 'publisher'])
+ props.hostPattern = getHostPattern(props.publisherId)
+
+ return props
}
render () {
- if (!this.props.locationInfo) {
- return null
- }
- return this.shouldShowAddPublisherButton
- ?
-
-
- : null
+ return
+
+
}
}
+module.exports = ReduxComponent.connect(PublisherToggle)
+
const styles = StyleSheet.create({
addPublisherButtonContainer: {
boxSizing: 'border-box',
@@ -166,5 +129,3 @@ const styles = StyleSheet.create({
backgroundSize: '18px'
}
})
-
-module.exports = PublisherToggle
diff --git a/app/renderer/components/navigation/urlBar.js b/app/renderer/components/navigation/urlBar.js
index 9c70db6cd2b..b4a90a8ce6f 100644
--- a/app/renderer/components/navigation/urlBar.js
+++ b/app/renderer/components/navigation/urlBar.js
@@ -33,11 +33,11 @@ const cx = require('../../../../js/lib/classSet')
const debounce = require('../../../../js/lib/debounce')
const {getSetting} = require('../../../../js/settings')
const contextMenus = require('../../../../js/contextMenus')
-const UrlUtil = require('../../../../js/lib/urlutil')
const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../../js/lib/eventUtil')
const {getBaseUrl, isUrl} = require('../../../../js/lib/appUrlUtil')
const {getCurrentWindowId} = require('../../currentWindow')
const {normalizeLocation} = require('../../../common/lib/suggestion')
+const publisherUtil = require('../../../common/lib/publisherUtil')
// Icons
const iconNoScript = require('../../../../img/url-bar-no-script.svg')
@@ -431,7 +431,7 @@ class UrlBar extends React.Component {
const activeTabId = activeFrame.get('tabId', tabState.TAB_ID_NONE)
const location = tabState.getVisibleURL(state, activeTabId)
- const frameLocation = activeFrame.get('location') || ''
+ const frameLocation = activeFrame.get('location', '')
const displayEntry = tabState.getVisibleEntry(state, activeTabId) || Immutable.Map()
const displayURL = tabState.getVisibleVirtualURL(state, activeTabId) || ''
const hostValue = displayEntry.get('host', '')
@@ -445,12 +445,6 @@ class UrlBar extends React.Component {
// TODO(bridiver) - these definitely needs a helpers
const publisherId = state.getIn(['locationInfo', baseUrl, 'publisher'])
- const hostPattern = UrlUtil.getHostPattern(publisherId)
- const hostSettings = siteSettings.getSiteSettingsForHostPattern(state.get('settings'), hostPattern)
- const ledgerPaymentsShown = hostSettings && hostSettings.get('ledgerPaymentsShown')
- const visiblePublisher = typeof ledgerPaymentsShown === 'boolean' ? ledgerPaymentsShown : true
- const isPublisherButtonEnabled = getSetting(settings.PAYMENTS_ENABLED) &&
- UrlUtil.isHttpOrHttps(location) && visiblePublisher
const activateSearchEngine = urlbar.getIn(['searchDetail', 'activateSearchEngine'])
const urlbarSearchDetail = urlbar.get('searchDetail')
@@ -480,7 +474,7 @@ class UrlBar extends React.Component {
props.loading = activeFrame.get('loading')
props.noScriptIsVisible = currentWindow.getIn(['ui', 'noScriptInfo', 'isVisible']) || false
props.menubarVisible = ownProps.menubarVisible
- props.noBorderRadius = isPublisherButtonEnabled
+ props.publisherButtonVisible = publisherUtil.shouldShowAddPublisherButton(state, location, publisherId)
props.onStop = ownProps.onStop
props.titleMode = ownProps.titleMode
props.urlbarLocation = urlbarLocation
@@ -509,7 +503,7 @@ class UrlBar extends React.Component {
className={cx({
urlbarForm: true,
[css(styles.urlbarForm_wide)]: this.props.isWideURLbarEnabled,
- noBorderRadius: this.props.noBorderRadius
+ noBorderRadius: this.props.publisherButtonVisible
})}
action='#'
id='urlbar'>
diff --git a/test/unit/app/common/lib/publisherUtilTest.js b/test/unit/app/common/lib/publisherUtilTest.js
new file mode 100644
index 00000000000..892050361f8
--- /dev/null
+++ b/test/unit/app/common/lib/publisherUtilTest.js
@@ -0,0 +1,133 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* global describe, it, before, beforeEach, after */
+
+const assert = require('assert')
+const mockery = require('mockery')
+const Immutable = require('immutable')
+
+require('../../../braveUnit')
+
+describe('publisherUtil test', function () {
+ let publisherUtil, getSetting
+
+ before(function () {
+ mockery.enable({
+ warnOnReplace: false,
+ warnOnUnregistered: false,
+ useCleanCache: true
+ })
+
+ mockery.registerMock('../../../js/settings', {
+ getSetting: () => getSetting
+ })
+ publisherUtil = require('../../../../../app/common/lib/publisherUtil')
+ })
+
+ beforeEach(function () {
+ getSetting = true
+ })
+
+ after(function () {
+ mockery.disable()
+ })
+
+ describe('shouldShowAddPublisherButton', function () {
+ const state = Immutable.fromJS({
+ siteSettings: {
+ 'https?://brave.com': {
+ ledgerPayments: false
+ }
+ }
+ })
+
+ it('location is empty', function () {
+ const result = publisherUtil.shouldShowAddPublisherButton(state, '', 'brave.com')
+ assert.equal(result, false)
+ })
+
+ it('location is about page', function () {
+ const result = publisherUtil.shouldShowAddPublisherButton(state, 'about:about', 'about:about')
+ assert.equal(result, false)
+ })
+
+ it('location is file', function () {
+ const result = publisherUtil.shouldShowAddPublisherButton(state, 'file://test.txt', 'test.txt')
+ assert.equal(result, false)
+ })
+
+ it('payment is disabled', function () {
+ getSetting = false
+ const result = publisherUtil.shouldShowAddPublisherButton(state, 'https://brave.com', 'brave.com')
+ assert.equal(result, false)
+ })
+
+ it('everything is ok', function () {
+ const result = publisherUtil.shouldShowAddPublisherButton(state, 'https://brave.com', 'brave.com')
+ assert.equal(result, true)
+ })
+ })
+
+ describe('enabledForPaymentsPublisher', function () {
+ const state = Immutable.fromJS({
+ locationInfo: {
+ 'https://brave.com': {
+ exclude: false,
+ publisher: 'brave.com',
+ stickyP: false,
+ timestamp: 1496942403068,
+ verified: false
+ }
+ },
+ publisherInfo: {
+ synopsis: {
+ 0: {
+ daysSpent: 0,
+ duration: 623405,
+ faviconURL: '',
+ hoursSpent: 0,
+ minutesSpent: 10,
+ percentage: 100,
+ publisherURL: 'http://brave.com',
+ score: 9.365888800773842,
+ secondsSpent: 23,
+ site: 'brave.com',
+ verified: false,
+ views: 1,
+ weight: 100
+ }
+ }
+ },
+ siteSettings: {
+ 'https?://brave.com': {
+ ledgerPayments: false
+ }
+ }
+ })
+
+ it('host settings is null, but publisher synopsis is valid', function () {
+ let newState = state.set('siteSettings', Immutable.fromJS({}))
+ const result = publisherUtil.enabledForPaymentsPublisher(newState, 'https://brave.com')
+ assert.equal(result, true)
+ })
+
+ it('host settings is null, publisher synopsis is null, but auto include is on and exclude on off', function () {
+ let newState = state.set('siteSettings', Immutable.fromJS({}))
+ newState = newState.set('publisherInfo', Immutable.fromJS({}))
+ const result = publisherUtil.enabledForPaymentsPublisher(newState, 'https://brave.com')
+ assert.equal(result, true)
+ })
+
+ it('host settings is set and ledgerPayments is false', function () {
+ const result = publisherUtil.enabledForPaymentsPublisher(state, 'https://brave.com')
+ assert.equal(result, false)
+ })
+
+ it('host settings is set and ledgerPayments is true', function () {
+ let newState = state.setIn(['siteSettings', 'https?://brave.com', 'ledgerPayments'], true)
+ const result = publisherUtil.enabledForPaymentsPublisher(newState, 'https://brave.com')
+ assert.equal(result, true)
+ })
+ })
+})
diff --git a/test/unit/app/renderer/components/navigation/navigationBarTest.js b/test/unit/app/renderer/components/navigation/navigationBarTest.js
new file mode 100644
index 00000000000..54a9d525f9a
--- /dev/null
+++ b/test/unit/app/renderer/components/navigation/navigationBarTest.js
@@ -0,0 +1,136 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* global describe, it, before, after */
+
+const mockery = require('mockery')
+const React = require('react')
+const {mount} = require('enzyme')
+const assert = require('assert')
+const Immutable = require('immutable')
+const fakeElectron = require('../../../../lib/fakeElectron')
+require('../../../../braveUnit')
+
+class urlBarFake extends React.Component {
+ render () {
+ return null
+ }
+}
+
+const fakeAppState = Immutable.fromJS({
+ locationInfo: {
+ 'https://brave.com': {
+ exclude: false,
+ publisher: 'brave.com',
+ stickyP: false,
+ timestamp: 1496942403068,
+ verified: true
+ }
+ },
+ publisherInfo: {
+ synopsis: {
+ 0: {
+ daysSpent: 0,
+ duration: 623405,
+ faviconURL: '',
+ hoursSpent: 0,
+ minutesSpent: 10,
+ percentage: 100,
+ publisherURL: 'https://brave.com',
+ score: 9.365888800773842,
+ secondsSpent: 23,
+ site: 'brave.com',
+ verified: false,
+ views: 1,
+ weight: 100
+ }
+ }
+ },
+ siteSettings: {
+ 'https?://brave.com': {
+ ledgerPayments: false,
+ ledgerPaymentsShown: false
+ }
+ },
+ tabs: [{
+ active: true,
+ tabId: 1,
+ canGoBack: true,
+ canGoForward: true,
+ windowId: 1
+ }],
+ tabsInternal: {
+ index: {
+ 1: 0
+ }
+ },
+ windows: []
+})
+
+const defaultWindowStore = Immutable.fromJS({
+ activeFrameKey: 0,
+ frames: [{
+ key: 0,
+ tabId: 1,
+ location: 'https://brave.com'
+ }],
+ tabs: [{
+ key: 0
+ }]
+})
+
+describe('NavigationBar component', function () {
+ let NavigationBar, windowStore, appStore
+
+ before(function () {
+ mockery.enable({
+ warnOnReplace: false,
+ warnOnUnregistered: false,
+ useCleanCache: true
+ })
+ mockery.registerMock('electron', fakeElectron)
+ mockery.registerMock('../../../js/settings', {
+ getSetting: () => true
+ })
+ mockery.registerMock('../../../../img/url-bar-no-script.svg')
+ mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
+ 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('../../../extensions/brave/img/caret_down_grey.svg')
+ mockery.registerMock('./urlBar', urlBarFake)
+ windowStore = require('../../../../../../js/stores/windowStore')
+ appStore = require('../../../../../../js/stores/appStoreRenderer')
+ NavigationBar = require('../../../../../../app/renderer/components/navigation/navigationBar')
+ })
+
+ after(function () {
+ mockery.disable()
+ })
+
+ describe('publisherToggle', function () {
+ it('do not render if about page', function () {
+ windowStore.state = defaultWindowStore.setIn(['frames', 0, 'location'], 'about:preferences')
+ appStore.state = fakeAppState
+
+ const wrapper = mount(
)
+ assert.equal(wrapper.find('PublisherToggle').length, 0)
+ })
+
+ it('do not render if publisher is permanently hidden', function () {
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState
+
+ const wrapper = mount(
)
+ assert.equal(wrapper.find('PublisherToggle').length, 0)
+ })
+
+ it('render if ok', function () {
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState.setIn(['siteSettings', 'https?://brave.com', 'ledgerPaymentsShown'], true)
+
+ const wrapper = mount(
)
+ assert.equal(wrapper.find('PublisherToggle').length, 1)
+ })
+ })
+})
diff --git a/test/unit/app/renderer/components/navigation/publisherToggleTest.js b/test/unit/app/renderer/components/navigation/publisherToggleTest.js
index fe461a397d2..88b1dc50841 100644
--- a/test/unit/app/renderer/components/navigation/publisherToggleTest.js
+++ b/test/unit/app/renderer/components/navigation/publisherToggleTest.js
@@ -1,41 +1,66 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global describe, it, before, after */
+
const mockery = require('mockery')
-const {shallow} = require('enzyme')
+const {mount} = require('enzyme')
const assert = require('assert')
const Immutable = require('immutable')
const fakeElectron = require('../../../../lib/fakeElectron')
-const settingsConst = require('../../../../../../js/constants/settings')
-const {getHostPattern} = require('../../../../../../js/lib/urlutil')
-let PublisherToggle
require('../../../../braveUnit')
-describe('PublisherToggle component', function () {
- const getUrlOrigin = url => url.split('/').slice(0, 3).join('/')
- const getHostName = url => getUrlOrigin(url).split('/').slice(2).join('/')
- const getPattern = pattern => getHostPattern(getHostName(pattern))
-
- const locationInfo = (url, exclude, verified) => Immutable.fromJS({
- [url]: {
- 'publisher': getHostName(url),
- 'exclude': exclude,
- 'verified': verified
+const fakeAppState = Immutable.fromJS({
+ locationInfo: {
+ 'https://brave.com': {
+ exclude: false,
+ publisher: 'brave.com',
+ stickyP: false,
+ timestamp: 1496942403068,
+ verified: true
}
- })
- const hostPattern = (pattern, isEnabled, shouldShow) => Immutable.fromJS({
- [getPattern(pattern)]: {
- 'ledgerPayments': isEnabled,
- 'ledgerPaymentsShown': shouldShow
+ },
+ publisherInfo: {
+ synopsis: {
+ 0: {
+ daysSpent: 0,
+ duration: 623405,
+ faviconURL: '',
+ hoursSpent: 0,
+ minutesSpent: 10,
+ percentage: 100,
+ publisherURL: 'https://brave.com',
+ score: 9.365888800773842,
+ secondsSpent: 23,
+ site: 'brave.com',
+ verified: false,
+ views: 1,
+ weight: 100
+ }
}
- })
- const publisherSynopsis = (url, verified) => Immutable.fromJS([{
- 'site': getHostName(url),
- 'publisherURL': url,
- 'verified': verified
- }])
- const paymentsEnabled = settingsConst.PAYMENTS_ENABLED
- const autoSuggestSites = settingsConst.AUTO_SUGGEST_SITES
- const url1 = 'https://clifton.io/sharing-my-passion-for-mercedes-benz'
- const aboutPage = 'about:preferences'
+ },
+ siteSettings: {
+ 'https?://brave.com': {
+ ledgerPayments: false,
+ ledgerPaymentsShown: false
+ }
+ }
+})
+
+const defaultWindowStore = Immutable.fromJS({
+ activeFrameKey: 0,
+ frames: [{
+ key: 0,
+ tabId: 1,
+ location: 'https://brave.com'
+ }],
+ tabs: [{
+ key: 0
+ }]
+})
+
+describe('PublisherToggle component', function () {
+ let PublisherToggle, windowStore, appStore
before(function () {
mockery.enable({
@@ -43,123 +68,58 @@ describe('PublisherToggle component', function () {
warnOnUnregistered: false,
useCleanCache: true
})
+ mockery.registerMock('electron', fakeElectron)
mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
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('../../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
- if (settingKey === paymentsEnabled || settingKey === autoSuggestSites) {
- return true
- }
- return false
- }})
- mockery.registerMock('electron', fakeElectron)
- window.chrome = fakeElectron
+ mockery.registerMock('../../../../js/settings', {
+ getSetting: () => true
+ })
+ windowStore = require('../../../../../../js/stores/windowStore')
+ appStore = require('../../../../../../js/stores/appStoreRenderer')
PublisherToggle = require('../../../../../../app/renderer/components/navigation/publisherToggle')
})
+
after(function () {
mockery.disable()
})
describe('default behaviour (when autoSuggest is ON)', function () {
- it('show as enabled if site is on synopsis list (siteSettings is empty)', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-authorized'], true)
- })
- it('show as enabled if hostPattern is on siteSettings list (synopsis is empty)', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-authorized'], true)
- })
- it('show as enabled if url exists in locationInfo (both synopsis and siteSettings are empty)', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-authorized'], true)
- })
it('Show as disabled if publisher is on exclusion list', function () {
- const wrapper = shallow(
-
- )
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState.setIn(['locationInfo', 'https://brave.com', 'exclude'], true)
+
+ const wrapper = mount(
)
assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-authorized'], false)
+ assert.equal(wrapper.find('span').props()['data-test-authorized'], false)
})
+
it('Show as verified if publisher is shown as verified on locationInfo list', function () {
- const wrapper = shallow(
-
- )
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState
+ const wrapper = mount(
)
assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-verified'], true)
- })
- it('do not render if about page', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 0)
+ assert.equal(wrapper.find('span').props()['data-test-verified'], true)
})
})
describe('user interaction behaviour', function () {
- it('do not render if publisher is permanently hidden', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 0)
- })
it('show as enabled if ledgerPayments is true for that publisher', function () {
- const wrapper = shallow(
-
- )
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState.setIn(['siteSettings', 'https?://brave.com', 'ledgerPayments'], true)
+
+ const wrapper = mount(
)
assert.equal(wrapper.find('[data-test-id="publisherButton"]').length, 1)
- assert.equal(wrapper.props()['data-test-authorized'], true)
+ assert.equal(wrapper.find('span').props()['data-test-authorized'], true)
})
+
it('Show as disabled if ledgerPayments is false for that publisher', function () {
- const wrapper = shallow(
-
- )
- assert.equal(wrapper.props()['data-test-authorized'], false)
+ windowStore.state = defaultWindowStore
+ appStore.state = fakeAppState
+
+ const wrapper = mount(
)
+ assert.equal(wrapper.find('span').props()['data-test-authorized'], false)
})
})
})
diff --git a/test/unit/app/renderer/components/navigation/urlBarIconTest.js b/test/unit/app/renderer/components/navigation/urlBarIconTest.js
index f154f717cd5..5c78b2e7280 100644
--- a/test/unit/app/renderer/components/navigation/urlBarIconTest.js
+++ b/test/unit/app/renderer/components/navigation/urlBarIconTest.js
@@ -12,55 +12,55 @@ const assert = require('assert')
const fakeElectron = require('../../../../lib/fakeElectron')
require('../../../../braveUnit')
-const tabId = 1
-const frameKey = 0
+describe('UrlBarIcon component unit tests', function () {
+ let UrlBarIcon, windowActions, windowStore, appStore
-const fakeAppStoreRenderer = Immutable.fromJS({
- windows: [{
- windowId: 1,
- windowUUID: 'uuid'
- }],
- tabs: [{
- tabId: tabId,
- windowId: 1,
- windowUUID: 'uuid',
- url: 'https://brave.com',
- messageBoxDetail: false
- }],
- tabsInternal: {
- index: {
- 1: 0
- }
- }
-})
+ const tabId = 1
+ const frameKey = 0
-const defaultWindowStore = Immutable.fromJS({
- activeFrameKey: frameKey,
- frames: [{
- key: frameKey,
- tabId: tabId,
- location: 'https://brave.com',
- security: {
- isSecure: true
- },
- navbar: {
- urlbar: {
- location: 'https://brave.com',
- active: false,
- searchDetail: {
- activateSearchEngine: true
- }
+ const fakeAppStoreRenderer = Immutable.fromJS({
+ windows: [{
+ windowId: 1,
+ windowUUID: 'uuid'
+ }],
+ tabs: [{
+ tabId: tabId,
+ windowId: 1,
+ windowUUID: 'uuid',
+ url: 'https://brave.com',
+ messageBoxDetail: false
+ }],
+ tabsInternal: {
+ index: {
+ 1: 0
}
- },
- title: 'Brave Software'
- }],
- tabs: [{
- key: frameKey
- }]
-})
+ }
+ })
-describe('UrlBarIcon component unit tests', function () {
- let UrlBarIcon, windowActions, windowStore, appStore
+ const defaultWindowStore = Immutable.fromJS({
+ activeFrameKey: frameKey,
+ frames: [{
+ key: frameKey,
+ tabId: tabId,
+ location: 'https://brave.com',
+ security: {
+ isSecure: true
+ },
+ navbar: {
+ urlbar: {
+ location: 'https://brave.com',
+ active: false,
+ searchDetail: {
+ activateSearchEngine: true
+ }
+ }
+ },
+ title: 'Brave Software'
+ }],
+ tabs: [{
+ key: frameKey
+ }]
+ })
before(function () {
mockery.enable({
@@ -69,29 +69,34 @@ describe('UrlBarIcon component unit tests', function () {
useCleanCache: true
})
mockery.registerMock('electron', fakeElectron)
- UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon')
windowActions = require('../../../../../../js/actions/windowActions')
windowStore = require('../../../../../../js/stores/windowStore')
appStore = require('../../../../../../js/stores/appStoreRenderer')
+ UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon')
})
after(function () {
mockery.disable()
})
- it('sets element as draggable', function () {
- appStore.state = fakeAppStoreRenderer
- windowStore.state = defaultWindowStore
- const wrapper = mount(
)
- assert.equal(wrapper.find('span[draggable]').length, 1)
- })
+ describe('general things', function () {
+ before(function () {
+ appStore.state = fakeAppStoreRenderer
+ windowStore.state = defaultWindowStore
+ })
- it('shows site information when clicked', function () {
- const spy = sinon.spy(windowActions, 'setSiteInfoVisible')
- const wrapper = mount(
)
- wrapper.find('[data-test-id="urlBarIcon"]').simulate('click')
- assert.equal(spy.calledOnce, true)
- windowActions.setSiteInfoVisible.restore()
+ it('sets element as draggable', function () {
+ const wrapper = mount(
)
+ assert.equal(wrapper.find('span[draggable]').length, 1)
+ })
+
+ it('shows site information when clicked', function () {
+ const spy = sinon.spy(windowActions, 'setSiteInfoVisible')
+ const wrapper = mount(
)
+ wrapper.find('[data-test-id="urlBarIcon"]').simulate('click')
+ assert.equal(spy.calledOnce, true)
+ windowActions.setSiteInfoVisible.restore()
+ })
})
describe('when user is searching', function () {