test(e2e): add back Trace API call test

Author: dszakallas

test/e2e/apiCalls.spec.js

@@ -30,13 +30,17 @@ var apiCalls = [
   'RpmMetrics',
   'ApmMetrics',
   'ExternalEdgeMetrics',
-  'IncomingEdgeMetrics'
-  // 'Trace'
+  'IncomingEdgeMetrics',
+  'Trace'
 ]
 
 apiCalls.forEach(function (name) {
   test('should report ' + name,
     {
+      // FIXME: I patched nock, so it can gunzip requests on appropriate
+      // content-encoding headers, however it uses the sync API due to
+      // design limitations in nock.
+      skip: name == 'Trace' && !zlib.gunzipSync,
       isolate: 'child-process',
       childProcessOpts: cpOpts
     }, function (t) {

test/e2e/crash/index.spec.js

@@ -22,33 +22,30 @@ var env = {
   TRACE_COLLECTOR_API_URL: 'http://127.0.0.1:' + TEST_WEB_SERVER_PORT
 }
 
-test('should report crash', function (t) {
-  if (semver.satisfies(process.version, '>= 6')) {
-    t.plan(2)
-    var app = express()
-    app.use(bodyParser.json())
-    app.post('/transaction-events', function (req, res) {
-      var event = req.body.e.find(function (e) {
-        return e.t === 'err' && e.d.t === 'system-error'
-      })
-      t.ok(event != null, 'Error event exists')
-      t.end()
-      process.exit(0)
+test('should report crash', {
+  skip: !semver.satisfies(process.version, '>= 6')
+}, function (t) {
+  t.plan(2)
+  var app = express()
+  app.use(bodyParser.json())
+  app.post('/transaction-events', function (req, res) {
+    var event = req.body.e.find(function (e) {
+      return e.t === 'err' && e.d.t === 'system-error'
     })
-    app.listen(TEST_WEB_SERVER_PORT, function (err) {
-      t.error(err, 'server starts listening at ' + TEST_WEB_SERVER_PORT)
+    t.ok(event != null, 'Error event exists')
+    t.end()
+    process.exit(0)
+  })
+  app.listen(TEST_WEB_SERVER_PORT, function (err) {
+    t.error(err, 'server starts listening at ' + TEST_WEB_SERVER_PORT)
 
-      spawnSync('node', [path.join(__dirname, 'testee.js')], {
+    spawnSync('node', [path.join(__dirname, 'testee.js')], {
 
-        env: defaultsDeep({}, env, process.env)
-      })
-      setTimeout(function () {
-        t.fail('test timed out without completing')
-        process.exit(1)
-      }, TEST_TIMEOUT)
+      env: defaultsDeep({}, env, process.env)
     })
-  } else {
-    t.pass('Test does not apply for this version')
-    t.end()
-  }
+    setTimeout(function () {
+      t.fail('test timed out without completing')
+      process.exit(1)
+    }, TEST_TIMEOUT)
+  })
 })

test/e2e/package.json

@@ -9,8 +9,8 @@
     "body-parser": "^1.15.2",
     "express": "^4.14.0",
     "lodash.defaultsdeep": "^4.5.1",
-    "nock": "9.0.2",
     "sinon": "1.17.6",
+    "nock": "git+https://github.com/szdavid92/nock.git#feat/gzip-content-type-decoder",
     "semver": "^5.3.0",
     "spawn-sync": "^1.0.15",
     "string.prototype.startswith": "^0.2.0",