From 51d033335ca3dc347aa2ece88734c26d55642507 Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Thu, 2 Mar 2017 10:13:22 +0100
Subject: [PATCH] Fixed display for multiple homepages

Resolves #7442

Auditors: @darkdh

Test Plan:
- described in #7442
---
 js/about/preferences.js          |  8 ++++++--
 test/about/preferencesTest.js    | 20 ++++++++++++++++++--
 test/components/autofillTest.js  |  8 ++++----
 test/components/bookmarksTest.js |  8 ++++----
 test/lib/brave.js                |  3 ++-
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/js/about/preferences.js b/js/about/preferences.js
index 9e83929a988..9b9cf135919 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -561,17 +561,21 @@ class GeneralTab extends ImmutableComponent {
   }
 
   render () {
-    var languageOptions = this.props.languageCodes.map(function (lc) {
+    const languageOptions = this.props.languageCodes.map(function (lc) {
       return (
         <option data-l10n-id={lc} value={lc} />
       )
     })
-    var homepageValue = getSetting(settings.HOMEPAGE, this.props.settings)
+
+    let homepageValue = getSetting(settings.HOMEPAGE, this.props.settings)
     if (typeof homepageValue === 'string') {
       const punycodeUrl = UrlUtil.getPunycodeUrl(homepageValue)
       if (punycodeUrl.replace(/\/$/, '') !== homepageValue) {
         homepageValue = UrlUtil.getPunycodeUrl(homepageValue)
       }
+
+      // we use | as a separator for multiple home pages
+      homepageValue = homepageValue.replace(/%7C/g, '|')
     }
     const homepage = homepageValue && homepageValue.trim()
     const disableShowHomeButton = !homepage || !homepage.length
diff --git a/test/about/preferencesTest.js b/test/about/preferencesTest.js
index 2d15ecff648..47621c337de 100644
--- a/test/about/preferencesTest.js
+++ b/test/about/preferencesTest.js
@@ -31,7 +31,7 @@ describe('General Panel', function () {
         .loadUrl(prefsUrl)
         .waitForVisible(homepageInput)
         .click(homepageInput)
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('а')
         .waitUntil(function () {
           return this.getValue(homepageInput).then((val) => {
@@ -39,13 +39,14 @@ describe('General Panel', function () {
           })
         })
     })
+
     it('homepage can be backspaced', function * () {
       yield this.app.client
         .tabByIndex(0)
         .loadUrl(prefsUrl)
         .waitForVisible(homepageInput)
         .click(homepageInput)
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('/')
         .keys('1')
         .keys(Brave.keys.BACKSPACE)
@@ -57,6 +58,21 @@ describe('General Panel', function () {
           })
         })
     })
+
+    it('direct input', function * () {
+      yield this.app.client
+        .tabByIndex(0)
+        .loadUrl(prefsUrl)
+        .waitForVisible(homepageInput)
+        .click(homepageInput)
+        .keys(Brave.keys.END)
+        .keys('|https://duckduckgo.com')
+        .waitUntil(function () {
+          return this.getValue(homepageInput).then((val) => {
+            return val === 'https://www.brave.com/|https://duckduckgo.com'
+          })
+        })
+    })
   })
 
   describe('homepage multiple', function () {
diff --git a/test/components/autofillTest.js b/test/components/autofillTest.js
index 631d6f107e0..4601cfcb642 100644
--- a/test/components/autofillTest.js
+++ b/test/components/autofillTest.js
@@ -128,10 +128,10 @@ describe('Autofill', function () {
         .windowByUrl(Brave.browserWindowUrl)
         .waitForVisible(autofillAddressPanel)
         .click('#phone')
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('123')
         .click('#email')
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('mm')
         .click(saveAddressButton)
         .waitUntil(function () {
@@ -254,10 +254,10 @@ describe('Autofill', function () {
         .windowByUrl(Brave.browserWindowUrl)
         .waitForVisible(autofillCreditCardPanel)
         .click('#nameOnCard')
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('123')
         .click('#creditCardNumber')
-        .keys('\uE010') // send END key
+        .keys(Brave.keys.END)
         .keys('123')
         .selectByValue('.expMonthSelect', (expMonth + 1).toString())
         .selectByValue('.expYearSelect', (expYear + 1).toString())
diff --git a/test/components/bookmarksTest.js b/test/components/bookmarksTest.js
index 24dd10c6aff..f97bdfe4f81 100644
--- a/test/components/bookmarksTest.js
+++ b/test/components/bookmarksTest.js
@@ -65,11 +65,11 @@ describe('bookmark tests', function () {
           .click(navigatorBookmarked)
           .waitForVisible(doneButton)
           .setValue('#bookmarkName input', 'https://www.brave.com')
-          .keys('\uE010') // send END key
+          .keys(Brave.keys.END)
           .keys('а')
           .getValue('#bookmarkName input').should.eventually.be.equal('https://www.brave.xn--com-8cd/')
           .setValue('#bookmarkLocation input', 'https://www.brave.com')
-          .keys('\uE010') // send END key
+          .keys(Brave.keys.END)
           .keys('а')
           .getValue('#bookmarkLocation input').should.eventually.be.equal('https://www.brave.xn--com-8cd/')
           .click(removeButton)
@@ -81,13 +81,13 @@ describe('bookmark tests', function () {
           .click(navigatorBookmarked)
           .waitForVisible(doneButton)
           .setValue('#bookmarkName input', 'https://www.brave.com/1')
-          .keys('\uE010') // send END key
+          .keys(Brave.keys.END)
           .keys(Brave.keys.BACKSPACE)
           .keys(Brave.keys.BACKSPACE)
           .keys(Brave.keys.BACKSPACE)
           .getValue('#bookmarkName input').should.eventually.be.equal('https://www.brave.co')
           .setValue('#bookmarkLocation input', 'https://www.brave.com/1')
-          .keys('\uE010') // send END key
+          .keys(Brave.keys.END)
           .keys(Brave.keys.BACKSPACE)
           .keys(Brave.keys.BACKSPACE)
           .keys(Brave.keys.BACKSPACE)
diff --git a/test/lib/brave.js b/test/lib/brave.js
index 0be99c81b19..18b955debc1 100644
--- a/test/lib/brave.js
+++ b/test/lib/brave.js
@@ -82,7 +82,8 @@ var exports = {
     DELETE: '\ue017',
     DOWN: '\ue015',
     UP: '\ue013',
-    PAGEDOWN: '\uE00F'
+    PAGEDOWN: '\uE00F',
+    END: '\uE010'
   },
 
   defaultTimeout: 10000,