Bug 1338340 - Modernize browser_bug435035.js. r=nhnt11
authorJohann Hofmann <jhofmann@mozilla.com>
Mon, 29 May 2017 15:58:27 +0200
changeset 409390 b0382a33f8c452a5ff6ae03ad7d8d514d270e324
parent 409389 7163dcdf54dc5155703efc642900a355b8e8dc89
child 409391 e05ee5231980a2056854f9b60227bf29a61e122f
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnhnt11
bugs1338340, 435035
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1338340 - Modernize browser_bug435035.js. r=nhnt11 MozReview-Commit-ID: CBcVE70rkQE
browser/base/content/test/siteIdentity/browser.ini
browser/base/content/test/siteIdentity/browser_bug435035.js
browser/base/content/test/siteIdentity/browser_mixed_passive_content_indicator.js
browser/base/content/test/siteIdentity/simple_mixed_passive.html
browser/base/content/test/siteIdentity/test_bug435035.html
--- a/browser/base/content/test/siteIdentity/browser.ini
+++ b/browser/base/content/test/siteIdentity/browser.ini
@@ -1,16 +1,13 @@
 [DEFAULT]
 support-files =
   head.js
   !/image/test/mochitest/blue.png
 
-[browser_bug435035.js]
-support-files =
-  test_bug435035.html
 [browser_bug822367.js]
 tags = mcb
 support-files =
   file_bug822367_1.html
   file_bug822367_1.js
   file_bug822367_2.html
   file_bug822367_3.html
   file_bug822367_4.html
@@ -61,16 +58,20 @@ support-files =
   test_mcb_redirect_image.html
   test_mcb_double_redirect_image.html
   test_mcb_redirect.js
   test_mcb_redirect.sjs
 [browser_mixed_content_cert_override.js]
 tags = mcb
 support-files =
   test-mixedcontent-securityerrors.html
+[browser_mixed_passive_content_indicator.js]
+tags = mcb
+support-files =
+  simple_mixed_passive.html
 [browser_mixedcontent_securityflags.js]
 tags = mcb
 support-files =
   test-mixedcontent-securityerrors.html
 [browser_mixedContentFramesOnHttp.js]
 tags = mcb
 support-files =
   file_mixedContentFramesOnHttp.html
rename from browser/base/content/test/siteIdentity/browser_bug435035.js
rename to browser/base/content/test/siteIdentity/browser_mixed_passive_content_indicator.js
--- a/browser/base/content/test/siteIdentity/browser_bug435035.js
+++ b/browser/base/content/test/siteIdentity/browser_mixed_passive_content_indicator.js
@@ -1,17 +1,9 @@
-const TEST_URL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "https://example.com") + "test_bug435035.html";
+const TEST_URL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "https://example.com") + "simple_mixed_passive.html";
 
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(() => {
+add_task(async function test_mixed_passive_content_indicator() {
+  await BrowserTestUtils.withNewTab(TEST_URL, function() {
     is(document.getElementById("identity-box").className,
        "unknownIdentity mixedDisplayContent",
        "identity box has class name for mixed content");
-
-    gBrowser.removeCurrentTab();
-    finish();
   });
-
-  gBrowser.loadURI(TEST_URL);
-}
+});
rename from browser/base/content/test/siteIdentity/test_bug435035.html
rename to browser/base/content/test/siteIdentity/simple_mixed_passive.html