Issue 6923 - Simplify parsing of metadata

test/synchronizer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 241 matching lines @@
     testId += " skipping " + currentTest.skip + " hours after " + currentTest.skipAfter + " hours";
   exports.testExpirationTime[testId] = function(test)
   {
     let subscription = Subscription.fromURL("http://example.com/subscription");
     FilterStorage.addSubscription(subscription);
 
     let requests = [];
     this.registerHandler("/subscription", metadata =>
     {
       requests.push(this.getTimeOffset());
-      return [Cr.NS_OK, 200, "[Adblock]\n!foo\n!Expires: " + currentTest.expiration + "\nbar"];
+      return [Cr.NS_OK, 200, "[Adblock]\n!Expires: " + currentTest.expiration + "\nbar"];
     });
 
     this.randomResult = currentTest.randomResult;
 
     let maxHours = Math.round(Math.max.apply(null, currentTest.requests)) + 1;
     this.runScheduledTasks(maxHours, currentTest.skipAfter, currentTest.skip).then(() =>
     {
       test.deepEqual(requests, currentTest.requests, "Requests");
     }).catch(unexpectedError.bind(test)).then(() => test.done());
   };
@@ skipping 39 matching lines @@
   };
 }
 
 exports.testRedirects = function(test)
 {
   let subscription = Subscription.fromURL("http://example.com/subscription");
   FilterStorage.addSubscription(subscription);
 
   this.registerHandler("/subscription", metadata =>
   {
-    return [Cr.NS_OK, 200, "[Adblock]\n!foo\n!Redirect: http://example.com/redirected\nbar"];
+    return [Cr.NS_OK, 200, "[Adblock]\n!Redirect: http://example.com/redirected\nbar"];
   });
 
   let requests;
 
   this.runScheduledTasks(30).then(() =>
   {
     test.equal(FilterStorage.subscriptions[0], subscription, "Invalid redirect ignored");
     test.equal(subscription.downloadStatus, "synchronize_connection_error", "Connection error recorded");
     test.equal(subscription.errors, 2, "Number of download errors");
 
     requests = [];
 
     this.registerHandler("/redirected", metadata =>
     {
       requests.push(this.getTimeOffset());
-      return [Cr.NS_OK, 200, "[Adblock]\n!foo\n! Expires: 8 hours\nbar"];
+      return [Cr.NS_OK, 200, "[Adblock]\n! Expires: 8 hours\nbar"];
     });
 
     resetSubscription(subscription);
     return this.runScheduledTasks(15);
   }).then(() =>
   {
     test.equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Redirect followed");
     test.deepEqual(requests, [0 + initialDelay, 8 + initialDelay], "Resulting requests");
 
     this.registerHandler("/redirected", metadata =>
     {
-      return [Cr.NS_OK, 200, "[Adblock]\n!foo\n!Redirect: http://example.com/subscription\nbar"];
+      return [Cr.NS_OK, 200, "[Adblock]\n!Redirect: http://example.com/subscription\nbar"];
     });
 
     subscription = Subscription.fromURL("http://example.com/subscription");
     resetSubscription(subscription);
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     FilterStorage.addSubscription(subscription);
 
     return this.runScheduledTasks(2);
   }).then(() =>
   {
@@ skipping 142 matching lines @@
     return this.runScheduledTasks(24);
   }).then(() =>
   {
     test.equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after download error");
     test.equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (26 + initialDelay) * MILLIS_IN_HOUR, "lastDownload after download error");
     test.equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after download error");
     test.equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (27 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after download error");
     test.equal(subscription.errors, 2, "errors after download error");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };