+ {
+ this.props.ledgerData.get('created') && this.enabled
+ ?
+ : null
+ }
+
+ {
+
+ }
{
!this.showNoScriptInfo
? null
diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
index a3e414a619c..b50b4483766 100644
--- a/js/constants/appConfig.js
+++ b/js/constants/appConfig.js
@@ -157,6 +157,7 @@ module.exports = {
'advanced.minimum-visit-time': 8,
'advanced.minimum-visits': 5,
'advanced.minimum-percentage': false,
+ 'advanced.auto-suggest-sites': true,
'shutdown.clear-history': false,
'shutdown.clear-downloads': false,
'shutdown.clear-cache': false,
diff --git a/js/constants/settings.js b/js/constants/settings.js
index 54e9e1a1403..7d6ec9a556e 100644
--- a/js/constants/settings.js
+++ b/js/constants/settings.js
@@ -63,6 +63,7 @@ const settings = {
MINIMUM_VISIT_TIME: 'advanced.minimum-visit-time',
MINIMUM_VISITS: 'advanced.minimum-visits',
MINIMUM_PERCENTAGE: 'advanced.minimum-percentage',
+ AUTO_SUGGEST_SITES: 'advanced.auto-suggest-sites',
// DEPRECATED settings
// ########################
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 69c44d5cd3e..c6be3fddc01 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -676,7 +676,6 @@
content: ' ';
position: absolute;
background: #fff;
- border: 1px solid @focusUrlbarOutline;
border-radius: 4px;
box-shadow: 0 0 1px @focusUrlbarOutline, inset 0 0 2px @focusUrlbarOutline, inset 0 1px 8px rgba(0, 137, 255, 0.1);
color: #333;
@@ -731,7 +730,7 @@
}
.urlbarForm {
- &.noBorderRadius {
+ &.noBorderRadius {
border-radius: 0;
}
}
diff --git a/test/unit/app/renderer/publisherToggleTest.js b/test/unit/app/renderer/publisherToggleTest.js
new file mode 100644
index 00000000000..0674f5b148a
--- /dev/null
+++ b/test/unit/app/renderer/publisherToggleTest.js
@@ -0,0 +1,108 @@
+/* global describe, it, before, after */
+const mockery = require('mockery')
+const {shallow} = require('enzyme')
+const assert = require('assert')
+const Immutable = require('immutable')
+const tldjs = require('tldjs')
+const fakeElectron = require('../../lib/fakeElectron')
+const settingsConst = require('../../../../js/constants/settings')
+let PublisherToggle
+require('../../braveUnit')
+
+describe('PublisherToggle component', function () {
+ const getDomain = (url) => tldjs.getDomain(url)
+ const getPattern = (pattern) => `https?://${getDomain(pattern)}`
+ const getHostPattern = (pattern, isEnabled, shouldShow) => Immutable.fromJS({
+ [pattern]: {
+ 'ledgerPayments': isEnabled,
+ 'ledgerPaymentsShown': shouldShow
+ }
+ })
+ const getPublisherSynopsis = (url) => Immutable.fromJS([{
+ 'site': getDomain(url),
+ 'publisherURL': url
+ }])
+
+ const url1 = 'https://clifton.io/sharing-my-passion-for-mercedes-benz'
+ const domain1 = getDomain(url1)
+ const pattern1 = getPattern(domain1)
+
+ before(function () {
+ mockery.enable({
+ warnOnReplace: false,
+ warnOnUnregistered: false,
+ useCleanCache: true
+ })
+ mockery.registerMock('../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
+ if (settingKey === settingsConst.AUTO_SUGGEST_SITES) {
+ return false
+ }
+ return true
+ }})
+ mockery.registerMock('electron', fakeElectron)
+ window.chrome = fakeElectron
+ PublisherToggle = require('../../../../app/renderer/components/publisherToggle')
+ })
+ after(function () {
+ mockery.disable()
+ })
+
+ describe('criteria to be shown', function () {
+ it('renders if domain match synopsis criteria (siteSettings is empty)', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 1)
+ })
+ it('render if hostPattern match siteSettings (synopsis is empty)', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 1)
+ })
+ it('do not render for unauthorized publishers (no siteSettings and no synopsis)', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 0)
+ })
+ it('do not render if publisher is permanently hidden', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 0)
+ })
+ it('show as enabled if ledgerPayments is true for that publisher', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 1)
+ assert.equal(wrapper.find('.authorizedPublisher').length, 1)
+ })
+ it('Show as disabled if ledgerPayments is false for that publisher', function () {
+ const wrapper = shallow(
+
+ )
+ assert.equal(wrapper.find('.addPublisherButtonContainer').length, 1)
+ assert.equal(wrapper.find('.authorizedPublisher').length, 0)
+ })
+ })
+})