Bug 1270040 - Fix fx ui tests regressions for certerror page merge. r=gijs
MozReview-Commit-ID: D7qCF9q1eGY
--- a/testing/firefox-ui/tests/functional/security/test_security_notification.py
+++ b/testing/firefox-ui/tests/functional/security/test_security_notification.py
@@ -30,17 +30,17 @@ class TestSecurityNotification(FirefoxTe
with self.marionette.using_context('content'):
# Go to a site that has an invalid (expired) cert
self.assertRaises(MarionetteException, self.marionette.navigate, self.urls[0])
# Wait for the DOM to receive events
time.sleep(1)
# Verify the text in Technical Content contains the page with invalid cert
- text = self.marionette.find_element(By.ID, 'technicalContentText')
+ text = self.marionette.find_element(By.ID, 'badCertTechnicalInfo')
self.assertIn(self.urls[0][8:], text.get_attribute('textContent'))
# Verify the "Go Back" and "Advanced" buttons appear
self.assertIsNotNone(self.marionette.find_element(By.ID, 'returnButton'))
self.assertIsNotNone(self.marionette.find_element(By.ID, 'advancedButton'))
# Verify the error code is correct
self.assertIn('SEC_ERROR_EXPIRED_CERTIFICATE', text.get_attribute('textContent'))
--- a/testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
+++ b/testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
@@ -29,17 +29,17 @@ class TestSSLDisabledErrorPage(FirefoxTe
with self.marionette.using_context('content'):
# Open the test page
self.assertRaises(MarionetteException, self.marionette.navigate, self.url)
# Wait for the DOM to receive events
time.sleep(1)
# Verify "Secure Connection Failed" error page title
- title = self.marionette.find_element(By.ID, 'errorTitleText')
+ title = self.marionette.find_element(By.CLASS_NAME, 'title-text')
nss_failure2title = self.browser.get_entity('nssFailure2.title')
self.assertEquals(title.get_attribute('textContent'), nss_failure2title)
# Verify "Try Again" button appears
try_again_button = self.marionette.find_element(By.ID, 'errorTryAgain')
self.assertTrue(try_again_button.is_displayed())
# Verify the error message is correct