Issue 301 - adblockplustests: Use for (.. of ..)

chrome/content/tests/synchronizer.js

 (function()
 {
   let testRunner = null;
   let requestHandlers = null;
   let randomResult = 0.5;
 
   module("Synchronizer", {
     setup: function()
     {
       testRunner = this;
@@ skipping 109 matching lines @@
     });
 
     let tests = [
       {header: "[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
       {header: "[Adblock Plus]", downloadStatus: "synchronize_ok", requiredVersion: null},
       {header: "(something)[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
       {header: "[Adblock Plus 0.0.1]", downloadStatus: "synchronize_ok", requiredVersion: "0.0.1"},
       {header: "[Adblock Plus 99.9]", downloadStatus: "synchronize_ok", requiredVersion: "99.9"},
       {header: "[Foo]", downloadStatus: "synchronize_invalid_data", requiredVersion: null}
     ];
-    for each (test in tests)
+    for (test of tests)
     {
       resetSubscription(subscription)
       testRunner.runScheduledTasks(2);
 
       equal(subscription.downloadStatus, test.downloadStatus, "Download status for " + test.header)
       equal(subscription.requiredVersion, test.requiredVersion, "Required version for " + test.header)
 
       if (test.downloadStatus == "synchronize_ok")
       {
         deepEqual(subscription.filters, [
@@ skipping 99 matching lines @@
       },
       {
         expiration: "40 hours",
         randomResult: 0.5,
         skipAfter: 5.1,
         skip: 80,               // Hitting hard expiration, immediate download
         requests: [0.1, 85.1]
       }
     ]
 
-    for each (test in tests)
+    for (test of tests)
     {
       requests = [];
       randomResult = test.randomResult;
       resetSubscription(subscription);
 
       let maxHours = Math.round(Math.max.apply(null, test.requests)) + 1;
       testRunner.runScheduledTasks(maxHours, test.skipAfter, test.skip);
 
       let randomAddendum = (randomResult == 0.5 ? "" : " with Math.random() returning " + randomResult);
       let skipAddendum = (typeof test.skip != "number" ? "" : " skipping " + test.skip + " hours after " + test.skipAfter + " hours");
@@ skipping 20 matching lines @@
       ["= symbols after checksum are ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A===\nfoo\nbar\n", true],
       ["Header line is part of the checksum", "[Adblock Plus]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar\n", false],
       ["Special comments are part of the checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n! Expires: 1\nfoo\nbar\n", false],
     ];
 
     testRunner.registerHandler("/subscription", function(metadata)
     {
       return [Cr.NS_OK, 200, subscriptionBody];
     });
 
-    for each ([testName, subscriptionBody, expectedResult] in tests)
+    for ([testName, subscriptionBody, expectedResult] of tests)
     {
       resetSubscription(subscription);
       testRunner.runScheduledTasks(2);
       equal(subscription.downloadStatus, expectedResult ? "synchronize_ok" : "synchronize_checksum_mismatch", testName);
     }
   });
 
   test("Special comments", function()
   {
     let subscription = Subscription.fromURL("http://example.com/subscription");
     FilterStorage.addSubscription(subscription);
 
     let comment, check;
     let tests = [
       ["! Homepage: http://example.com/", function() equal(subscription.homepage, "http://example.com/", "Valid homepage comment")],
       ["! Homepage: ssh://example.com/", function() equal(subscription.homepage, null, "Invalid homepage comment")],
       ["! Title: foo", function()
         {
           equal(subscription.title, "foo", "Title comment");
           equal(subscription.fixedTitle, true, "Fixed title");
         }],
       ["! Version: 1234", function() equal(subscription.version, 1234, "Version comment")]
     ];
 
     testRunner.registerHandler("/subscription", function(metadata)
     {
       return [Cr.NS_OK, 200, "[Adblock]\n" + comment + "\nfoo\nbar"];
     });
 
-    for each([comment, check] in tests)
+    for ([comment, check] of tests)
     {
       resetSubscription(subscription);
       testRunner.runScheduledTasks(2);
       check();
       deepEqual(subscription.filters, [Filter.fromText("foo"), Filter.fromText("bar")], "Special comment not added to filters");
     }
   });
 
   test("Redirects", function()
   {
@@ skipping 178 matching lines @@
 
     testRunner.runScheduledTasks(24);
 
     equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after download error");
     equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + 26.1 * MILLIS_IN_HOUR, "lastDownload after download error");
     equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + 0.1 * MILLIS_IN_HOUR, "lastSuccess after download error");
     equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + 27.1 * MILLIS_IN_HOUR, "lastCheck after download error");
     equal(subscription.errors, 2, "errors after download error");
   });
 })();