Merge branch 'master' into trevj-cloud-deploy

Author: trevj

Gruntfile.coffee

@@ -56,6 +56,7 @@
     "grunt-vulcanize": "^0.6.0",
     "ipaddr.js": "^1.0.4",
     "jasmine-core": "^2.3.4",
+    "lodash": "^3.10.1",
     "request": "^2.53.0",
     "socks5-http-client": "^1.0.2",
     "ssh2": "0.4.12",

package.json

@@ -1,6 +1,9 @@
 /// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
 /// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
 
+import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
+import mockFreedomRtcPeerConnection = require('../freedom/mocks/mock-rtcpeerconnection');
+freedom = freedomMocker.makeMockFreedomInModuleEnv();
 import onetime = require('./onetime');
 
 interface Clown {

src/bridge/onetime.spec.ts

@@ -2,6 +2,7 @@
 
 /// <reference path='../../../third_party/typings/node/node.d.ts' />
 
+import fs = require('fs');
 import path = require('path');
 
 export interface RuleConfig {
@@ -95,6 +96,21 @@ export class Rule {
     }
   }
 
+  public jasmineSingleSpec(file :string) :JasmineRule {
+    return {
+      src: [
+        require.resolve('arraybuffer-slice'),
+        require.resolve('es6-promise'),
+        path.join(this.config.thirdPartyBuildPath, 'promise-polyfill.js'),
+      ],
+      options: {
+        specs: [ path.join(this.config.devBuildPath, file + '.spec.static.js') ],
+        outfile: path.join(this.config.devBuildPath, file, '/SpecRunner.html'),
+        keepRunner: true
+      }
+    }
+  }
+
   // Grunt browserify target creator
   public browserify(filepath:string, options = {
         browserifyOptions: { standalone: 'browserified_exports' }
@@ -215,4 +231,65 @@ export class Rule {
     return { files: allFilesForlibPaths.concat(copyInfo.files) };
   }
 
+  public buildAndRunTest(test :string, gruntConfig :{[c :string] :{[t :string] :Object}},
+                         coverage?:boolean) :string[] {
+    var name = test + 'Spec';
+    var browserifyRule = this.browserifySpec(test);
+    var jasmineRule = this.jasmineSingleSpec(test);
+
+    if (coverage) {
+      name += 'Cov';
+      browserifyRule = this.addCoverageToBrowserify(browserifyRule);
+      jasmineRule = this.addCoverageToSpec(jasmineRule);
+    }
+
+    gruntConfig['browserify'][name] = browserifyRule;
+    gruntConfig['jasmine'][name] = jasmineRule;
+
+    return [
+      'browserify:' + name,
+      'jasmine:' + name,
+    ];
+  }
+
+  /*
+   * Returns a list of tests that exist within the directory structure of a
+   * project.
+   *
+   * rootDir is the directory under which the layout will match what this file
+   * expects for paths being passed in (i.e. under devBuildPath)
+   *
+   * getTests('src');
+   *   Lists all tests under the src/ directory
+   * getTests('src', 'generic_ui/scripts');
+   *   Lists all tests under the generic_ui/scripts directory, all paths
+   *   relative to src/
+   * getTests('src', undefined, ['integration-tests']);
+   *   Lists all the tests under src/ ignoring anything named integration-tests
+   */
+  public getTests(rootDir :string, current :string = '', ignore :string[] = []) {
+    var tests :string[] = [];
+
+    var files = fs.readdirSync(path.join(rootDir, current));
+    for (var f in files) {
+      if (ignore.indexOf(files[f]) !== -1) {
+        continue;
+      }
+
+      var file = path.join(current, files[f]);
+
+      var stats = fs.statSync(path.join(rootDir, file));
+      if (stats.isDirectory()) {
+        tests = tests.concat(this.getTests(rootDir, file, ignore));
+      } else {
+        var match = /(.+)\.spec\.ts/.exec(file);
+        if (match) {
+          tests.push(match[1]);
+        }
+      }
+    }
+
+    return tests;
+  }
+
 }  // class Rule

src/build-tools/common-grunt-rules.ts

@@ -8,7 +8,7 @@ import logging = require('../logging/logging');
 // We keep this running on Amazon EC2 and the source
 // may be found here:
 //   https://github.com/uProxy/uproxy-probe/blob/master/python-src/probe-server.py
-var TEST_SERVER = '54.68.73.184';
+var TEST_SERVER = '52.34.126.245';
 var TEST_PORT = 6666;
 
 var log :logging.Log = new logging.Log('probe');

src/nat/probe.ts

@@ -1,6 +1,9 @@
 /// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
 /// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
 
+import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
+freedom = freedomMocker.makeMockFreedomInModuleEnv();
+
 import arithmetic = require('./arithmetic');
 import arraybuffers = require('../arraybuffers/arraybuffers');
 import decompression = require('./decompressionShaper');
@@ -28,7 +31,7 @@ describe('Arithmetic coding and decoding - short inputs', function() {
   it('decoding short input', function() {
     let encoded = arraybuffers.hexStringToArrayBuffer("ca.0.1.2.3.0.0.0.8");
     let target = arraybuffers.hexStringToArrayBuffer("0.1.2.3");
-    let result = decoder.decode(encoded);
+    let result = decoder.decode(encoded).slice(0, -2);
     expect(arraybuffers.byteEquality(result, target)).toBe(true);
   });
 });
@@ -52,7 +55,7 @@ describe('Arithmetic coding and decoding - long inputs', function() {
   it('decoding long input', function() {
     let encoded = arraybuffers.hexStringToArrayBuffer("ca.0.1.0.5c.21.12.a4.42.48.4e.43.6a.4e.47.54.66.37.31.45.42.0.6.0.21.34.47.4a.39.65.49.69.4d.75.59.55.35.43.38.49.6a.3a.69.7a.72.51.34.77.72.57.66.70.31.6b.57.66.44.64.0.0.0.80.29.0.8.9a.85.cd.95.50.c8.ee.a.0.24.0.4.6e.7e.1e.ff.0.8.0.14.3.45.95.42.22.f0.da.66.3e.8e.b8.cc.79.a1.f7.ba.1.f.d5.0.80.28.0.4.e2.28.43.3.0.0.0.74");
     let target = arraybuffers.hexStringToArrayBuffer("0.1.0.5c.21.12.a4.42.48.4e.43.6a.4e.47.54.66.37.31.45.42.0.6.0.21.34.47.4a.39.65.49.69.4d.75.59.55.35.43.38.49.6a.3a.69.7a.72.51.34.77.72.57.66.70.31.6b.57.66.44.64.0.0.0.80.29.0.8.9a.85.cd.95.50.c8.ee.a.0.24.0.4.6e.7e.1e.ff.0.8.0.14.3.45.95.42.22.f0.da.66.3e.8e.b8.cc.79.a1.f7.ba.1.f.d5.0.80.28.0.4.e2.28.43.3");
-    let decoded = decoder.decode(encoded);
+    let decoded = decoder.decode(encoded).slice(0, -2);
     expect(arraybuffers.byteEquality(decoded, target)).toBe(true);
   });
 })

src/transformers/arithmetic.spec.ts

@@ -1,6 +1,9 @@
 /// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
 /// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
 
+import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
+freedom = freedomMocker.makeMockFreedomInModuleEnv();
+
 import caesar = require('./caesar');
 
 describe("caesar cipher", function() {

src/transformers/caesar.spec.ts

@@ -1,6 +1,11 @@
 /// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
 /// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
 
+import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
+freedom = freedomMocker.makeMockFreedomInModuleEnv({
+  'core.udpsocket': (() => { /* MT */ }), // this only needs to be defined for test to work
+});
+
 import turn_frontend = require('./frontend');
 import messages = require('./messages');
 import net = require('../net/net.types');

src/turn/frontend.spec.ts

@@ -10,6 +10,7 @@ import RTCPeerConnection = freedom.RTCPeerConnection.RTCPeerConnection;
 import RTCDataChannelInit = freedom.RTCPeerConnection.RTCDataChannelInit;
 
 import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
+freedom = freedomMocker.makeMockFreedomInModuleEnv();
 
 import signals = require('./signals');
 import peerconnection = require('./peerconnection');
@@ -45,7 +46,7 @@ describe('PeerConnection', function() {
 
     // Mock synchronously emit onmessage immediately after ondatachannel.
     mockRtcDataChannel.handleEvent('onmessage', {text: 'foo'});
-    
+
     pc.peerOpenedChannelQueue.setSyncNextHandler((dc:datachannel.DataChannel) => {
       dc.dataFromPeerQueue.setSyncNextHandler((data:datachannel.Data) => {
         expect(data.str).toEqual('foo');