Improved update test polyfills

chromium/background-scripts/update.js

@@ -1,32 +1,24 @@
-/* global update_channels */
 /* global pako */
-/* global __dirname */
 
 "use strict";
 
 // Determine if we're in the tests.  If so, define some necessary components.
-if(typeof(window) == "undefined"){
-  const fs = require('fs');
-  const WebCrypto = require("node-webcrypto-ossl"),
+if (typeof window === "undefined") {
+  var WebCrypto = require("node-webcrypto-ossl"),
+    crypto = new WebCrypto(),
     atob = require("atob"),
     btoa = require("btoa"),
-    encoding = require('text-encoding');
-
-  var window = {
-    crypto: new WebCrypto(),
-    atob,
-    btoa
-  };
-
-  var update_channels = Function(fs.readFileSync(__dirname + '/update_channels.js').toString() + "return update_channels;")(),
-    pako = Function(fs.readFileSync(__dirname + '/../external/pako-1.0.5/pako_inflate.min.js').toString() + "return pako;")(),
-    TextDecoder = encoding.TextDecoder,
-    chrome = require("sinon-chrome");
+    pako = require('../external/pako-1.0.5/pako_inflate.min.js'),
+    { TextDecoder } = require('text-encoding'),
+    chrome = require("sinon-chrome"),
+    window = { atob, btoa, chrome, crypto, pako, TextDecoder };
 }
 
 (function(exports) {
 
+const { update_channels } = require('./update_channels');
 const util = require('./util');
+
 let store,
   background_callback;
 

chromium/background-scripts/update_channels.js

@@ -1,13 +1,23 @@
 /* exported update_channels */
 
-"use strict";
+'use strict';
 
-var update_channels = [{
-  name: "EFF (Full)",
+(function (exports) {
+
+exports.update_channels = [{
+  name: 'EFF (Full)',
   jwk: {
-    kty: "RSA",
-    e: "AQAB",
-    n: "1cwvFQu3Kw-Pz8bcEFuV5zx0ZheDsc4Tva7Qv6BL90_sDLqCW79Y543nDkPtNVfFH_89pt2kSPp_IcS5XnYiw6zBQeFuILFw5JpvZt14K0s4e025Q9CXfhYKIBKT9PnqihwAacjMa6rQb7RTu7XxVvqxRb3b0vx2CR40LSlYZ8H_KpeaUwq2oz-fyrI6LFTeYvbO3ZuLKeK5xV1a32xeTVMFkIj3LxnQalxq-DRHfj7LRRoTnbRDW4uoDc8aVpLFliuO79jUKbobz4slpiWJ4wjKR_O6OK13HbZUiOSxi8Bms-UqBPOyzbMVpmA7lv_zWdaLu1IVlVXQyLVbbrqI6llRqfHdcJoEl-eC48AofuB-relQtjTEK_hyBf7sPwrbqAarjRjlyEx6Qy5gTXyxM9attfNAeupYR6jm8LKm6TFpfWkyDxUmj_f5pJMBWNTomV74f8iQ2M18_KWMUDCOf80tR0t21Q1iCWdvA3K_KJn05tTLyumlwwlQijMqRkYuao-CX9L3DJIaB3VPYPTSIPUr7oi16agsuamOyiOtlZiRpEvoNg2ksJMZtwnj5xhBQydkdhMW2ZpHDzcLuZlhJYZL_l3_7wuzRM7vpyA9obP92CpZRFJErGZmFxJC93I4U9-0B0wg-sbyMKGJ5j1BWTnibCklDXtWzXtuiz18EgE"
+    kty: 'RSA',
+    e: 'AQAB',
+    n: '1cwvFQu3Kw-Pz8bcEFuV5zx0ZheDsc4Tva7Qv6BL90_sDLqCW79Y543nDkPtNVfFH_89pt2kSPp_IcS5XnYiw6zBQeFuILFw5JpvZt14K0s4' +
+       'e025Q9CXfhYKIBKT9PnqihwAacjMa6rQb7RTu7XxVvqxRb3b0vx2CR40LSlYZ8H_KpeaUwq2oz-fyrI6LFTeYvbO3ZuLKeK5xV1a32xeTVMF' +
+       'kIj3LxnQalxq-DRHfj7LRRoTnbRDW4uoDc8aVpLFliuO79jUKbobz4slpiWJ4wjKR_O6OK13HbZUiOSxi8Bms-UqBPOyzbMVpmA7lv_zWdaL' +
+       'u1IVlVXQyLVbbrqI6llRqfHdcJoEl-eC48AofuB-relQtjTEK_hyBf7sPwrbqAarjRjlyEx6Qy5gTXyxM9attfNAeupYR6jm8LKm6TFpfWky' +
+       'DxUmj_f5pJMBWNTomV74f8iQ2M18_KWMUDCOf80tR0t21Q1iCWdvA3K_KJn05tTLyumlwwlQijMqRkYuao-CX9L3DJIaB3VPYPTSIPUr7oi1' +
+       '6agsuamOyiOtlZiRpEvoNg2ksJMZtwnj5xhBQydkdhMW2ZpHDzcLuZlhJYZL_l3_7wuzRM7vpyA9obP92CpZRFJErGZmFxJC93I4U9-0B0wg' +
+       '-sbyMKGJ5j1BWTnibCklDXtWzXtuiz18EgE'
   },
-  update_path_prefix: "https://www.https-rulesets.org/v1/"
+  update_path_prefix: 'https://www.https-rulesets.org/v1/'
 }];
+
+})(typeof exports === 'undefined' ? require.scopes.update_channels = {} : exports);

chromium/test/update_test.js

@@ -9,8 +9,8 @@ const assert = require('chai').assert,
   sinon = require('sinon');
 
 const fs = require('fs'),
-  update_channels = Function(fs.readFileSync(__dirname + '/../background-scripts/update_channels.js').toString() + "return update_channels;")(),
-  pako = Function(fs.readFileSync(__dirname + '/../external/pako-1.0.5/pako_inflate.min.js').toString() + "return pako;")();
+  { update_channels } = require('../background-scripts/update_channels'),
+  pako = require('../external/pako-1.0.5/pako_inflate.min.js');
 
 util.setDefaultLogLevel(util.WARN);