Bug 1193200 - comm-beta only: fix test-general-content-policy.js beta porting. a=mkmelin
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Thu, 26 Nov 2015 22:36:59 +0200
changeset 23374 137d56c94bd3185fd0bc28ae6ac9e7a8d551c36e
parent 23373 e867061f442c5b92dfefabdade4db5e8b670c76a
child 23375 dd89f017a76cba3f37ef12fdeb9ab47514ec06df
push id1523
push usermkmelin@iki.fi
push dateThu, 26 Nov 2015 20:41:13 +0000
treeherdercomm-beta@137d56c94bd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1193200
Bug 1193200 - comm-beta only: fix test-general-content-policy.js beta porting. a=mkmelin
mail/test/mozmill/content-policy/test-general-content-policy.js
--- a/mail/test/mozmill/content-policy/test-general-content-policy.js
+++ b/mail/test/mozmill/content-policy/test-general-content-policy.js
@@ -285,17 +285,17 @@ function checkAllowForSenderWithPerms(te
 
   // Now check that the content hasn't been blocked
   if (!test.checkForAllowed(mozmill.getMail3PaneController()
            .window.content.document.getElementById("testelement")))
     throw new Error(test.type + " has been unexpectedly blocked for sender=" +
                     authorEmailAddress);
 
   // Clean up after ourselves, and make sure that worked as expected.
-  Services.perms.remove(authorEmailAddress, "image");
+  Services.perms.remove(uri, "image");
   assert_true(Services.perms.testPermission(uri, "image") ==
               Services.perms.UNKNOWN_ACTION);
 
   ++gMsgNo;
 }
 
 /**
  * Check remote content is not blocked for a hosts with permissions.
@@ -329,17 +329,17 @@ function checkAllowForHostsWithPerms(tes
 
   // Now check that the content hasn't been blocked.
   if (!test.checkForAllowed(mozmill.getMail3PaneController()
            .window.content.document.getElementById("testelement")))
     throw new Error(test.type + " has been unexpectedly blocked for url=" +
                     uri.spec);
 
   // Clean up after ourselves, and make sure that worked as expected.
-  Services.perms.remove(uri.host, "image");
+  Services.perms.remove(uri, "image");
   assert_true(Services.perms.testPermission(uri, "image") ==
               Services.perms.UNKNOWN_ACTION);
 
   ++gMsgNo;
 }
 
 function test_generalContentPolicy() {
   let folderTab = mc.tabmail.currentTabInfo;