Bug 982988 - Fix browser_bug415846.js to load the new location of its-a-trap.html and re-enable it
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 12 Mar 2014 20:40:58 -0700
changeset 191561 cbce1167c712880278c9018e625f8c9f7ad80ff5
parent 191560 f65e5e3da4150c22cfc783f13dea2a1c0e4feead
child 191562 9b1812a7852ea59b33e685b8cba4e0f320bf599d
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs982988, 415846
milestone30.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 982988 - Fix browser_bug415846.js to load the new location of its-a-trap.html and re-enable it
browser/components/safebrowsing/content/test/browser.ini
browser/components/safebrowsing/content/test/browser_bug415846.js
--- a/browser/components/safebrowsing/content/test/browser.ini
+++ b/browser/components/safebrowsing/content/test/browser.ini
@@ -1,10 +1,8 @@
 [DEFAULT]
 support-files = head.js
 
 [browser_bug400731.js]
 [browser_bug415846.js]
-skip-if = true
-# Disabled because it seems to now touch network resources
-# skip-if = os == "mac"
+skip-if = os == "mac"
 # Disabled on Mac because of its bizarre special-and-unique
 # snowflake of a help menu.
--- a/browser/components/safebrowsing/content/test/browser_bug415846.js
+++ b/browser/components/safebrowsing/content/test/browser_bug415846.js
@@ -33,17 +33,17 @@ function testNormal_PopupListener() {
   var errorMenu = document.getElementById("menu_HelpPopup_reportPhishingErrortoolmenu");
   is(reportMenu.hidden, false, "Report phishing menu should be visible on normal sites");
   is(errorMenu.hidden, true, "Report error menu item should be hidden on normal sites");
   menu.hidePopup();
   
   // Now launch the phishing test.  Can't use onload here because error pages don't
   // fire normal load events.
   window.addEventListener("DOMContentLoaded", testPhishing, true);
-  content.location = "http://www.mozilla.org/firefox/its-a-trap.html";
+  content.location = "http://www.itisatrap.org/firefox/its-a-trap.html";
 }
 
 function testPhishing() {
   window.removeEventListener("DOMContentLoaded", testPhishing, true);
 
   menu.addEventListener("popupshown", testPhishing_PopupListener, false);
   menu.openPopup(null, "", 0, 0, false, null);
 }