Bug 1304004 - Fix regression in firefox-ui security tests caused by bug 1303291. r=keeler

MozReview-Commit-ID: Co7efI9jgeC

--HG--
extra : rebase_source : eed286ae2b379058c59385a98d208e8f3bec87e7

testing/firefox-ui/tests/functional/security/manifest.ini

@@ -2,15 +2,11 @@
 tags = remote
 
 [test_dv_certificate.py]
-skip-if = true # 1304004
 [test_enable_privilege.py]
 tags = local
 [test_ev_certificate.py]
-skip-if = true # 1304004
 [test_mixed_content_page.py]
-skip-if = true # 1304004
 [test_mixed_script_content_blocking.py]
-skip-if = true # 1304004
 [test_no_certificate.py]
 tags = local
 [test_safe_browsing_initial_download.py]

testing/firefox-ui/tests/functional/security/test_dv_certificate.py

@@ -29,10 +29,6 @@ class TestDVCertificate(PuppeteerMixin, MarionetteTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        # The lock icon should be shown
-        self.assertIn('identity-secure',
-                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
-
         self.assertEqual(self.locationbar.identity_box.get_attribute('className'),
                          'verifiedDomain')
 

testing/firefox-ui/tests/functional/security/test_ev_certificate.py

@@ -29,10 +29,6 @@ class TestEVCertificate(PuppeteerMixin, MarionetteTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        # The lock icon should be shown
-        self.assertIn('identity-secure',
-                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
-
         # Check the identity box
         self.assertEqual(self.locationbar.identity_box.get_attribute('className'),
                          'verifiedIdentity')

testing/firefox-ui/tests/functional/security/test_mixed_content_page.py

@@ -25,8 +25,8 @@ class TestMixedContentPage(PuppeteerMixin, MarionetteTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        self.assertIn('identity-mixed-passive-loaded',
-                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
+        self.assertEqual(self.locationbar.identity_box.get_attribute('className'),
+                         'unknownIdentity mixedDisplayContent')
 
         # Open the identity popup
         self.locationbar.open_identity_popup()

testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py

@@ -32,23 +32,22 @@ class TestMixedScriptContentBlocking(PuppeteerMixin, MarionetteTestCase):
 
     def _expect_protection_status(self, enabled):
         if enabled:
-            color, icon_filename, state = (
+            color, identity, state = (
                 'rgb(0, 136, 0)',
-                'identity-secure',
+                'verifiedDomain mixedActiveBlocked',
                 'blocked'
             )
         else:
-            color, icon_filename, state = (
+            color, identity, state = (
                 'rgb(255, 0, 0)',
-                'identity-mixed-active-loaded',
+                'unknownIdentity mixedActiveContent',
                 'unblocked'
             )
 
         # First call to Wait() needs a longer timeout due to the reload of the web page.
-        connection_icon = self.locationbar.connection_icon
         Wait(self.marionette, timeout=self.browser.timeout_page_load).until(
-            lambda _: icon_filename in connection_icon.value_of_css_property('list-style-image'),
-            message="The correct icon is displayed"
+            lambda _: self.locationbar.identity_box.get_attribute('className') == identity,
+            message='Expected identity "{}" not found'.format(identity)
         )
 
         with self.marionette.using_context('content'):