replace yes/no to allow/deny for notifcation bar

Auditors: @luixxiul, @srirambv close brave#9750
dfperry5 · Aug 18, 2017 · f25770f · f25770f
1 parent 821998d
commit f25770f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/app/browser/reducers/autoplayReducer.js b/app/browser/reducers/autoplayReducer.js
@@ -31,8 +31,8 @@ const showAutoplayMessageBox = (state, tabId) => {
 
   appActions.showNotification({
     buttons: [
-      {text: locale.translation('yes')},
-      {text: locale.translation('no')}
+      {text: locale.translation('allow')},
+      {text: locale.translation('deny')}
     ],
     message,
     frameOrigin: origin,

diff --git a/app/browser/reducers/passwordManagerReducer.js b/app/browser/reducers/passwordManagerReducer.js
@@ -102,8 +102,8 @@ const savePassword = (username, origin, tabId) => {
     // Notification not shown already
     appActions.showNotification({
       buttons: [
-        {text: locale.translation('yes')},
-        {text: locale.translation('no')},
+        {text: locale.translation('allow')},
+        {text: locale.translation('deny')},
         {text: locale.translation('neverForThisSite')}
       ],
       options: {
@@ -149,8 +149,8 @@ const updatePassword = (username, origin, tabId) => {
     // Notification not shown already
     appActions.showNotification({
       buttons: [
-        {text: locale.translation('yes')},
-        {text: locale.translation('no')}
+        {text: locale.translation('allow')},
+        {text: locale.translation('deny')}
       ],
       options: {
         persist: false,

diff --git a/app/index.js b/app/index.js
@@ -224,8 +224,8 @@ app.on('ready', () => {
       } else {
         appActions.showNotification({
           buttons: [
-            {text: locale.translation('yes')},
-            {text: locale.translation('no')}
+            {text: locale.translation('allow')},
+            {text: locale.translation('deny')}
           ],
           options: {
             persist: false

diff --git a/js/about/styles.js b/js/about/styles.js
@@ -294,8 +294,8 @@ class AboutStyle extends ImmutableComponent {
         <BrowserButton groupedItem secondaryColor notificationItem l10nId='notificationItem' onClick={this.onEnableAutoplay} />
         <BrowserButton groupedItem secondaryColor notificationItem l10nId='notificationItem' onClick={this.onEnableAutoplay} />
         <Pre><Code>
-          &lt;BrowserButton groupedItem secondaryColor notificationItem l10nId='Yes' onClick={'{this.onEnableAutoplay}'} />{'\n'}
-          &lt;BrowserButton groupedItem secondaryColor notificationItem l10nId='No' onClick={'{this.onEnableAutoplay}'} />
+          &lt;BrowserButton groupedItem secondaryColor notificationItem l10nId='Allow' onClick={'{this.onEnableAutoplay}'} />{'\n'}
+          &lt;BrowserButton groupedItem secondaryColor notificationItem l10nId='Deny' onClick={'{this.onEnableAutoplay}'} />
         </Code></Pre>
 
         <BrowserButton iconOnly iconClass={globalStyles.appIcons.moreInfo} size='30px' color='rebeccapurple' />

diff --git a/test/bravery-components/notificationBarTest.js b/test/bravery-components/notificationBarTest.js
@@ -126,7 +126,7 @@ describe('notificationBar passwords', function () {
         return this.getText(notificationBar).then((val) => {
           return val.includes('brave') && val.includes('brave_user')
         })
-      }).click('button=No')
+      }).click('button=Deny')
   })
 
   it('does not include a password in the notification bar', function * () {
@@ -144,7 +144,7 @@ describe('notificationBar passwords', function () {
         return this.getText(notificationBar).then((val) => {
           return val.includes('your password') && !val.includes('secret')
         })
-      }).click('button=No')
+      }).click('button=Deny')
   })
 
   it('autofills remembered password on login form', function * () {
@@ -159,7 +159,7 @@ describe('notificationBar passwords', function () {
       .waitForExist(notificationBar)
       .waitUntil(function () {
         return this.getText(notificationBar).then((val) => val.includes('brave') && val.includes('brave_user'))
-      }).click('button=Yes')
+      }).click('button=Allow')
       .tabByIndex(0)
       .loadUrl('about:passwords')
       .waitForExist('[data-test-id="passwordItem"]')
@@ -189,7 +189,7 @@ describe('notificationBar passwords', function () {
       .waitForExist(notificationBar)
       .waitUntil(function () {
         return this.getText(notificationBar).then((val) => val.includes('brave') && val.includes('brave_user'))
-      }).click('button=Yes')
+      }).click('button=Allow')
       .tabByIndex(0)
       .loadUrl('about:passwords')
       .waitForExist('[data-test-id="passwordItem"]')
@@ -206,7 +206,7 @@ describe('notificationBar passwords', function () {
       .waitForExist(notificationBar)
       .waitUntil(function () {
         return this.getText(notificationBar).then((val) => val.includes('brave') && val.includes('brave_user') && val.includes('update'))
-      }).click('button=Yes')
+      }).click('button=Allow')
       .tabByIndex(0)
       .url(this.loginUrl1)
       .waitForExist('#acctmgr_loginform')
@@ -334,7 +334,7 @@ describe('Autoplay test', function () {
         .waitUntil(function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
-        .click('button=Yes')
+        .click('button=Allow')
         .tabByUrl(url)
         .waitUntil(function () {
           return this.getText('div[id="status"]')
@@ -368,7 +368,7 @@ describe('Autoplay test', function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
         .click('[data-l10n-id=rememberDecision]')
-        .click('button=Yes')
+        .click('button=Allow')
         .tabByUrl(url)
         .waitUntil(function () {
           return this.getText('div[id="status"]')
@@ -426,7 +426,7 @@ describe('Autoplay test', function () {
         .waitUntil(function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
-        .click('button=No')
+        .click('button=Deny')
         .windowByUrl(Brave.browserWindowUrl)
         .activateURLMode()
         .click(reloadButton)
@@ -458,7 +458,7 @@ describe('Autoplay test', function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
         .click('[data-l10n-id=rememberDecision]')
-        .click('button=No')
+        .click('button=Deny')
         .windowByUrl(Brave.browserWindowUrl)
         .click(reloadButton)
         .tabByUrl(url)
@@ -522,7 +522,7 @@ describe('Autoplay test', function () {
         .waitUntil(function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
-        .click('button=Yes')
+        .click('button=Allow')
         .tabByUrl(url)
         .waitUntil(function () {
           return this.getText('div[id="status"]')
@@ -556,7 +556,7 @@ describe('Autoplay test', function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
         .click('[data-l10n-id=rememberDecision]')
-        .click('button=Yes')
+        .click('button=Allow')
         .tabByUrl(url)
         .waitUntil(function () {
           return this.getText('div[id="status"]')
@@ -614,7 +614,7 @@ describe('Autoplay test', function () {
         .waitUntil(function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
-        .click('button=No')
+        .click('button=Deny')
         .windowByUrl(Brave.browserWindowUrl)
         .activateURLMode()
         .click(reloadButton)
@@ -646,7 +646,7 @@ describe('Autoplay test', function () {
           return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
         })
         .click('[data-l10n-id=rememberDecision]')
-        .click('button=No')
+        .click('button=Deny')
         .windowByUrl(Brave.browserWindowUrl)
         .click(reloadButton)
         .tabByUrl(url)

diff --git a/test/unit/app/browser/reducers/autoplayReducerTest.js b/test/unit/app/browser/reducers/autoplayReducerTest.js
@@ -20,8 +20,8 @@ describe('autoplayReducer unit tests', function () {
   const message = `Allow ${origin} to autoplay media?`
   const showNotificationArg = {
     buttons: [
-      {text: 'Yes'},
-      {text: 'No'}
+      {text: 'Allow'},
+      {text: 'Deny'}
     ],
     message,
     frameOrigin: origin,
@@ -58,11 +58,11 @@ describe('autoplayReducer unit tests', function () {
       translation: (msg, arg) => {
         let retMsg = ''
         switch (msg) {
-          case 'yes':
-            retMsg += 'Yes'
+          case 'allow':
+            retMsg += 'Allow'
             break
-          case 'no':
-            retMsg += 'No'
+          case 'deny':
+            retMsg += 'Deny'
             break
           case 'allowAutoplay':
             retMsg += `Allow ${arg.origin} to autoplay media?`
@@ -116,8 +116,8 @@ describe('autoplayReducer unit tests', function () {
 
     it('calls local.translation', function () {
       assert(translationSpy.withArgs('allowAutoplay', {origin}).called)
-      assert(translationSpy.withArgs('yes').called)
-      assert(translationSpy.withArgs('no').called)
+      assert(translationSpy.withArgs('allow').called)
+      assert(translationSpy.withArgs('deny').called)
     })
 
     it('calls appActions.showNotification', function () {
@@ -154,8 +154,8 @@ describe('autoplayReducer unit tests', function () {
 
     it('calls local.translation', function () {
       assert(translationSpy.withArgs('allowAutoplay', {origin}).called)
-      assert(translationSpy.withArgs('yes').called)
-      assert(translationSpy.withArgs('no').called)
+      assert(translationSpy.withArgs('allow').called)
+      assert(translationSpy.withArgs('deny').called)
     })
 
     it('calls appActions.showNotification', function () {
@@ -188,8 +188,8 @@ describe('autoplayReducer unit tests', function () {
 
     it('calls local.translation', function () {
       assert(translationSpy.withArgs('allowAutoplay', {origin}).called)
-      assert(translationSpy.withArgs('yes').called)
-      assert(translationSpy.withArgs('no').called)
+      assert(translationSpy.withArgs('allow').called)
+      assert(translationSpy.withArgs('deny').called)
     })
 
     it('calls appActions.showNotification', function () {
@@ -218,8 +218,8 @@ describe('autoplayReducer unit tests', function () {
 
     it('calls local.translation', function () {
       assert(translationSpy.withArgs('allowAutoplay', {origin}).called)
-      assert(translationSpy.withArgs('yes').called)
-      assert(translationSpy.withArgs('no').called)
+      assert(translationSpy.withArgs('allow').called)
+      assert(translationSpy.withArgs('deny').called)
     })
 
     it('calls appActions.showNotification', function () {