Bug 1210703 - followup: fix test file used in caps and fix assertions to have actual/expected value in the right order, rs=bustage on a CLOSED TREE
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 09 Nov 2015 19:10:23 +0000
changeset 305946 67fbffadaa47af2ba4d397f34f6c07e909bf0d6e
parent 305945 68a879c220d8c777e165ab9df5c1a6a4a3c703f2
child 305947 96655290bcd9b649610c40d23449cf79b0a6a26a
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1210703
milestone45.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 1210703 - followup: fix test file used in caps and fix assertions to have actual/expected value in the right order, rs=bustage on a CLOSED TREE
caps/tests/mochitest/test_bug292789.html
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -49,18 +49,18 @@ function testScriptSrc(aCallback) {
       // trigger the callback
       if (aCallback)
         aCallback();
     }
 }
 
 /** <img src=""> tests **/
 var img_global = "chrome://global/skin/icons/Error.png";
-var img_mozapps = "chrome://mozapps/skin/passwordmgr/key.png";
-var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png";
+var img_mozapps = "chrome://mozapps/skin/passwordmgr/key-16.png";
+var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png";
 
 var imgTests = [[img_global, "success"],
                 [img_mozapps, "fail"],
                 [res_mozapps, "success"]];
 
 var curImgTest = 0;
 
 function runImgTest() {
@@ -69,24 +69,24 @@ function runImgTest() {
     loadImage(test[0], test[1], callback);
 }
 
 function finishTest() {
   SimpleTest.finish();
 }
 
 function fail(event) {
-    is(event.target.expected, "fail",
+    is("fail", event.target.expected,
        "content should not be allowed to load "+event.target.src);
     if (event.target.callback)
       event.target.callback();
 }
 
 function success(event) {
-    is(event.target.expected, "success",
+    is("success", event.target.expected,
        "content should be able to load "+event.target.src);
     if (event.target.callback)
       event.target.callback();
 }
 
 function loadImage(uri, expect, callback) {
     var img = document.createElement("img");
     img.onerror = fail;