From 47b2f6a07097488c4ab06f040594dc7e7c6007b5 Mon Sep 17 00:00:00 2001
From: Kate Glazko <katglazko@gmail.com>
Date: Fri, 20 Mar 2020 13:48:54 -0700
Subject: [PATCH] For 7077 Simplify Display Url

---
 .../androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt | 2 +-
 .../java/org/mozilla/fenix/ui/robots/BrowserRobot.kt      | 8 ++++----
 .../java/org/mozilla/fenix/ui/robots/SearchRobot.kt       | 4 ++--
 .../fenix/components/toolbar/BrowserToolbarView.kt        | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
index 1473a1cdc..d7735690d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
@@ -83,7 +83,7 @@ class TopSitesTest {
             verifyExistingTopSitesTabs(defaultWebPageTitle)
         }.openTopSiteTabWithTitle(title = defaultWebPageTitle) {
             verifyPageContent(defaultWebPage.content)
-            verifyUrl(defaultWebPage.url.toString())
+            verifyUrl(defaultWebPage.url.toString().replace("http://", ""))
         }.openHomeScreen {
             verifyExistingTopSitesList()
             verifyExistingTopSitesTabs(defaultWebPageTitle)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index a9ab7a2cd..33f78df17 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -57,19 +57,19 @@ class BrowserRobot {
         )
         TestAssetHelper.waitingTime
         onView(withId(R.id.mozac_browser_toolbar_url_view))
-                .check(matches(withText(containsString(url))))
+                .check(matches(withText(containsString(url.replace("http://", "")))))
     }
 
     fun verifyHelpUrl() {
-        verifyUrl("https://support.mozilla.org/")
+        verifyUrl("support.mozilla.org/")
     }
 
     fun verifyWhatsNewURL() {
-        verifyUrl("https://support.mozilla.org/")
+        verifyUrl("support.mozilla.org/")
     }
 
     fun verifyRateOnGooglePlayURL() {
-        verifyUrl("https://play.google.com/store/apps/details?id=org.mozilla.fenix")
+        verifyUrl("play.google.com/store/apps/details?id=org.mozilla.fenix")
     }
 
     /* Asserts that the text within DOM element with ID="testContent" has the given text, i.e.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index b0655abd7..8bfe0f56e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -138,10 +138,10 @@ private fun clearButton() = onView(withId(R.id.mozac_browser_toolbar_clear_view)
 
 private fun assertSearchEngineURL(searchEngineName: String) {
     mDevice.waitNotNull(
-        Until.findObject(By.textContains("https://${searchEngineName.toLowerCase()}.com/?q=mozilla")),
+        Until.findObject(By.textContains("${searchEngineName.toLowerCase()}.com/?q=mozilla")),
         TestAssetHelper.waitingTime
     )
-    onView(allOf(withText(startsWith("https://${searchEngineName.toLowerCase()}.com"))))
+    onView(allOf(withText(startsWith("${searchEngineName.toLowerCase()}.com"))))
         .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index 7a24b75aa..ea1f06b50 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -25,6 +25,7 @@ import mozilla.components.browser.session.Session
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.browser.toolbar.display.DisplayToolbar
 import mozilla.components.support.ktx.android.util.dpToFloat
+import mozilla.components.support.utils.URLStringUtils
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.customtabs.CustomTabToolbarIntegration
@@ -166,6 +167,8 @@ class BrowserToolbarView(
                     ThemeManager.resolveAttribute(R.attr.toolbarDivider, container.context)
                 )
 
+                display.urlFormatter = { url -> URLStringUtils.toDisplayUrl(url) }
+
                 display.colors = display.colors.copy(
                     text = primaryTextColor,
                     securityIconSecure = primaryTextColor,