author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Tue, 25 Oct 2016 11:47:14 +0200 | |
changeset 319262 | 523d47a7f8f38c271a2d5cf4fb9cbdbad1036e3b |
parent 319261 | 78b863e9fcd9d44d75c817b6495b4585167ba255 |
child 319263 | ced3b02ea694ce36382918060fa76b6cbd978254 |
push id | 30866 |
push user | cbook@mozilla.com |
push date | Tue, 25 Oct 2016 09:47:48 +0000 |
treeherder | mozilla-central@523d47a7f8f3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1304004 |
milestone | 52.0a1 |
backs out | 005f4ce1bf67627089986974e97eee1a5c16743c |
first release with | nightly linux32
523d47a7f8f3
/
52.0a1
/
20161025030205
/
files
nightly linux64
523d47a7f8f3
/
52.0a1
/
20161025030205
/
files
nightly mac
523d47a7f8f3
/
52.0a1
/
20161025030205
/
files
nightly win32
523d47a7f8f3
/
52.0a1
/
20161025030205
/
files
nightly win64
523d47a7f8f3
/
52.0a1
/
20161025030205
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
52.0a1
/
20161025030205
/
pushlog to previous
nightly linux64
52.0a1
/
20161025030205
/
pushlog to previous
nightly mac
52.0a1
/
20161025030205
/
pushlog to previous
nightly win32
52.0a1
/
20161025030205
/
pushlog to previous
nightly win64
52.0a1
/
20161025030205
/
pushlog to previous
|
--- a/testing/firefox-ui/tests/functional/security/manifest.ini +++ b/testing/firefox-ui/tests/functional/security/manifest.ini @@ -1,17 +1,21 @@ [DEFAULT] 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] [test_safe_browsing_notification.py] [test_safe_browsing_warning_pages.py] [test_security_notification.py] [test_ssl_disabled_error_page.py] [test_ssl_status_after_restart.py]
--- a/testing/firefox-ui/tests/functional/security/test_dv_certificate.py +++ b/testing/firefox-ui/tests/functional/security/test_dv_certificate.py @@ -24,20 +24,19 @@ class TestDVCertificate(FirefoxTestCase) self.windows.close_all([self.browser]) finally: FirefoxTestCase.tearDown(self) def test_dv_cert(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) - # The correct lock icon should be shown - icon = self.locationbar.connection_icon - self.assertEqual('url("chrome://browser/skin/connection-secure.svg")', - icon.value_of_css_property('list-style-image')) + # 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') # Open the identity popup self.locationbar.open_identity_popup() # Check the identity popup doorhanger
--- a/testing/firefox-ui/tests/functional/security/test_ev_certificate.py +++ b/testing/firefox-ui/tests/functional/security/test_ev_certificate.py @@ -24,20 +24,19 @@ class TestEVCertificate(FirefoxTestCase) self.windows.close_all([self.browser]) finally: FirefoxTestCase.tearDown(self) def test_ev_certificate(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) - # The correct lock icon should be shown - icon = self.locationbar.connection_icon - self.assertEqual('url("chrome://browser/skin/connection-secure.svg")', - icon.value_of_css_property('list-style-image')) + # 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') # Get the information from the certificate cert = self.browser.tabbar.selected_tab.certificate address = self.security.get_address_from_certificate(cert)
--- a/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py +++ b/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py @@ -19,23 +19,18 @@ class TestMixedContentPage(FirefoxTestCa self.identity_popup.close(force=True) finally: FirefoxTestCase.tearDown(self) def test_mixed_content(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) - # The correct lock icon should be shown - icon = self.locationbar.connection_icon - self.assertEqual('url("chrome://browser/skin/connection-mixed-passive-loaded.svg#icon")', - icon.value_of_css_property('list-style-image')) - - self.assertEqual(self.locationbar.identity_box.get_attribute('className'), - 'unknownIdentity mixedDisplayContent') + self.assertIn('identity-mixed-passive-loaded', + self.locationbar.connection_icon.value_of_css_property('list-style-image')) # Open the identity popup self.locationbar.open_identity_popup() # Only the insecure label is visible in the main view secure_label = self.identity_popup.view.main.secure_connection_label self.assertEqual(secure_label.value_of_css_property('display'), 'none')
--- a/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py +++ b/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py @@ -27,39 +27,35 @@ class TestMixedScriptContentBlocking(Fir def tearDown(self): try: self.identity_popup.close(force=True) finally: FirefoxTestCase.tearDown(self) def _expect_protection_status(self, enabled): if enabled: - color, icon_filename, identity, state = ( + color, icon_filename, state = ( 'rgb(0, 136, 0)', - 'url("chrome://browser/skin/connection-secure.svg")', - 'verifiedDomain mixedActiveBlocked', + 'identity-secure', 'blocked' ) else: - color, icon_filename, identity, state = ( + color, icon_filename, state = ( 'rgb(255, 0, 0)', - 'url("chrome://browser/skin/connection-mixed-active-loaded.svg#icon")', - 'unknownIdentity mixedActiveContent', + 'identity-mixed-active-loaded', '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 _: connection_icon.value_of_css_property('list-style-image') == icon_filename, - message='Connection icon "{}" is not set'.format(icon_filename) + lambda _: icon_filename in connection_icon.value_of_css_property('list-style-image'), + message="The correct icon is displayed" ) - self.assertEqual(self.locationbar.identity_box.get_attribute('className'), identity) - with self.marionette.using_context('content'): for identifier, description in self.test_elements: el = self.marionette.find_element(By.ID, identifier) Wait(self.marionette).until( lambda mn: el.value_of_css_property('color') == color, message=("%s has been %s" % (description, state)) )