Merge pull request #57 from exceptionless/browsertesting

Testing both node and browser suites

Author: srijken

appveyor.yml

@@ -11,6 +11,9 @@ install:
 build_script:
   - gulp build
 
+before_test:
+ #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 test_script:
   - gulp test
 

dist/exceptionless.min.js

@@ -1,9 +1,9 @@
 var fs = require("fs");
 var pkg = require('./package.json');
 var gulp = require('gulp');
-var replace = require('gulp-replace');
-var sourcemaps = require('gulp-sourcemaps');
+var $ = require('gulp-load-plugins')({lazy:true });
 var tsProject = require('tsproject');
+var eventStream = require('event-stream');
 
 gulp.task('clean', function () {
   var del = require('del');
@@ -23,24 +23,20 @@ gulp.task('typescript.node', function () {
 });
 
 gulp.task('exceptionless.umd', ['typescript', 'typescript.integrations'], function () {
-  var umd = require('gulp-wrap-umd');
   return gulp.src('dist/temp/src/exceptionless.js')
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(umd({
+    .pipe($.sourcemaps.init({ loadMaps: true }))
+    .pipe($.wrapUmd({
       exports: 'exports',
       globalName: 'exceptionless',
       namespace: 'exceptionless',
       deps: ['TraceKit'],
       template: fs.readFileSync('./umd.template.jst', 'utf8')
     }))
-    .pipe(sourcemaps.write('.'))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('dist/temp'));
 });
 
 gulp.task('exceptionless', ['exceptionless.umd'], function () {
-  var uglify = require('gulp-uglify');
-  var concat = require('gulp-concat');
-
   gulp.src('dist/temp/src/exceptionless.d.ts')
     .pipe(gulp.dest('dist'));
   var integrations = [
@@ -56,18 +52,18 @@ gulp.task('exceptionless', ['exceptionless.umd'], function () {
   ];
 
   gulp.src(files)
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(concat('exceptionless.js'))
-    .pipe(replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + pkg.version))
-    .pipe(sourcemaps.write('.'))
+    .pipe($.sourcemaps.init({ loadMaps: true }))
+    .pipe($.concat('exceptionless.js'))
+    .pipe($.replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + pkg.version))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('dist'));
 
   return gulp.src(files)
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(concat('exceptionless.min.js'))
-    .pipe(replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + pkg.version))
-    .pipe(uglify({ output: { beautify: false } }))
-    .pipe(sourcemaps.write('.'))
+    .pipe($.sourcemaps.init({ loadMaps: true }))
+    .pipe($.concat('exceptionless.min.js'))
+    .pipe($.replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + pkg.version))
+    .pipe($.uglify({ output: { beautify: false } }))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('dist'))
 });
 
@@ -79,9 +75,9 @@ gulp.task('exceptionless.node', ['typescript.node'], function () {
   ];
 
   gulp.src(files)
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(replace('exceptionless-js/1.0.0.0', 'exceptionless-node/' + pkg.version))
-    .pipe(sourcemaps.write('.'))
+    .pipe($.sourcemaps.init({ loadMaps: true }))
+    .pipe($.replace('exceptionless-js/1.0.0.0', 'exceptionless-node/' + pkg.version))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('dist'));
 });
 
@@ -90,10 +86,9 @@ gulp.task('watch', ['build'], function () {
 });
 
 gulp.task('lint', function () {
-  var tslint = require('gulp-tslint');
   return gulp.src(['src/**/*.ts', '!src/typings/**/*.ts'])
-    .pipe(tslint({ formatter: 'verbose' }))
-    .pipe(tslint.report());
+    .pipe($.tslint({ formatter: 'verbose' }))
+    .pipe($.tslint.report());
 });
 
 gulp.task('build', ['clean', 'lint', 'exceptionless', 'exceptionless.node']);
@@ -103,35 +98,50 @@ gulp.task('typescript.test', function () {
 });
 
 gulp.task('exceptionless.test.umd', ['typescript.test'], function () {
-  var umd = require('gulp-wrap-umd');
-  return gulp.src('dist/temp/src/exceptionless-spec.js')
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(umd({
+  var wrap = function(filename){
+    return gulp.src(filename)
+    .pipe($.sourcemaps.init({ loadMaps: true }))
+    .pipe($.wrapUmd({
       exports: 'exports',
       globalName: 'exceptionless',
       namespace: 'exceptionless'
     }))
-    .pipe(replace('}(this, function(require, exports, module) {', '}(this, function(require, exports, module) {\nif (!exports) {\n\tvar exports = {};\n}\n'))
-    .pipe(sourcemaps.write('.'))
+    .pipe($.replace('}(this, function(require, exports, module) {', '}(this, function(require, exports, module) {\nif (!exports) {\n\tvar exports = {};\n}\n'))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('dist/temp'));
+  };
+
+  return eventStream.merge(
+    wrap('dist/temp/src/exceptionless-nodespec.js'), 
+    wrap('dist/temp/src/exceptionless-browserspec.js'));
 });
 
-gulp.task('test', ['exceptionless.test.umd'], function(done) {
-  var mocha = require('gulp-mocha');
-  return gulp.src('dist/temp/exceptionless-spec.js', { read: false })
-    .pipe(mocha({
+gulp.task('test-node', ['exceptionless.test.umd'], function(done) {
+  return gulp.src('dist/temp/exceptionless-nodespec.js', { read: false })
+    .pipe($.mocha({
       require: ['source-map-support/register']
     }))
     .once('end', function () {
       process.exit();
     });
 });
 
+gulp.task('test-browser', ['exceptionless.test.umd'], function(){
+  return gulp
+    .src('testrunner.html')
+    .pipe($.mochaPhantomjs());
+});
+
+gulp.task('test', function(){
+  // test-node calls process.exit(), so run browser tests before node tests
+  var runSequence = require('run-sequence');
+  runSequence('test-browser', 'test-node');
+});
+
 gulp.task('format', function () {
-  var exec = require('gulp-exec');
   return gulp.src(['src/**/*.ts', '!src/typings/**/*.ts'])
-    .pipe(exec('node_modules/typescript-formatter/bin/tsfmt -r <%= file.path %>'))
-    .pipe(exec.reporter());
+    .pipe($.exec('node_modules/typescript-formatter/bin/tsfmt -r <%= file.path %>'))
+    .pipe($.exec.reporter());
 });
 
 gulp.task('default', ['watch', 'build', 'test']);

dist/exceptionless.min.js.map

@@ -31,18 +31,26 @@
     "del": "2.2.1",
     "es5-shim": "4.5.9",
     "es6-shim": "0.35.1",
+    "event-stream": "^3.3.4",
     "gulp": "3.9.1",
     "gulp-concat": "2.6.0",
     "gulp-exec": "2.1.2",
+    "gulp-load-plugins": "^1.3.0",
     "gulp-mocha": "2.2.0",
+    "gulp-mocha-phantomjs": "^0.12.0",
     "gulp-replace": "0.5.4",
     "gulp-sourcemaps": "1.6.0",
     "gulp-tslint": "6.0.1",
     "gulp-uglify": "1.5.4",
     "gulp-wrap-umd": "0.2.1",
+    "mock-fs": "3.11.0",
+    "path": "^0.12.7",
+    "requirejs": "^2.3.2",
+    "rewire": "^2.5.2",
     "rimraf": "2.5.3",
+    "run-sequence": "^1.2.2",
     "source-map-support": "0.4.2",
-    "mock-fs": "3.11.0",
+    "systemjs": "^0.19.39",
     "tracekit": "0.4.3",
     "tslint": "3.13.0",
     "tsproject": "1.2.1",

gulpfile.js

@@ -0,0 +1,23 @@
+import { NodeFileStorage } from './NodeFileStorage';
+
+import { describeStorage } from './Storage-spec';
+
+import * as mockFs from 'mock-fs';
+
+let mockedFs;
+
+let nodeFileStorageFactory = (maxItems?) => {
+  return new NodeFileStorage('test', './fileStorage', 'ex-', maxItems, mockedFs);
+};
+
+let nodeFileStorageInitializer = () => {
+  mockedFs = mockFs.fs({
+    'fileStorage': {}
+  });
+};
+
+describeStorage('NodeFileStorage',
+  nodeFileStorageFactory,
+  nodeFileStorageInitializer,
+  true
+);

package.json

@@ -3,34 +3,14 @@ import { IStorage } from './IStorage';
 import { IStorageItem } from './IStorageItem';
 
 import { InMemoryStorage } from './InMemoryStorage';
-import { NodeFileStorage } from './NodeFileStorage';
 
 import { expect } from 'chai';
-import * as mockFs from 'mock-fs';
-
-let mockedFs;
-
-let nodeFileStorageFactory = (maxItems?) => {
-  return new NodeFileStorage('test', './fileStorage', 'ex-', maxItems, mockedFs);
-};
-
-let nodeFileStorageInitializer = () => {
-  mockedFs = mockFs.fs({
-    'fileStorage': {}
-  });
-};
-
-describeStorage('NodeFileStorage',
-  nodeFileStorageFactory,
-  nodeFileStorageInitializer,
-  true
-);
 
 describeStorage('InMemoryStorage', (maxItems = 250) => {
   return new InMemoryStorage(maxItems);
 });
 
-function describeStorage(name: string,
+export function describeStorage(name: string,
   storageFactory: (maxItems?: number) => IStorage,
   beforeEachCallback?: () => void,
   recreateStorage: boolean = false) {

src/storage/Storage-nodespec.ts

@@ -7,14 +7,24 @@
     "target": "es5"
   },
   "bundles": {
-    "exceptionless-spec": {
+    "exceptionless-nodespec": {
       "files": [
         "typings/mocha/mocha.d.ts",
         "typings/chai/chai.d.ts",
         "typings/node/node.d.ts",
         "typings/stack-trace/stack-trace.d.ts",
 
-        "**/*-spec.ts"
+        "**/*-spec.ts",
+        "**/*-nodespec.ts"
+      ]
+    },
+    "exceptionless-browserspec": {
+      "files": [
+        "typings/mocha/mocha.d.ts",
+        "typings/chai/chai.d.ts",
+
+        "**/*-spec.ts",
+        "**/*-browserspec.ts"
       ]
     }
   }

src/storage/Storage-spec.ts

@@ -0,0 +1,19 @@
+require.config({
+    baseUrl: 'node_modules',
+     paths: {
+         chai: 'chai/chai',
+         TraceKit: 'tracekit/tracekit'
+     }
+});
+
+require([
+    '../dist/temp/exceptionless-browserspec'
+], function() {
+    
+    if (typeof mochaPhantomJS !== "undefined") { mochaPhantomJS.run(); }
+    else { 
+        
+        console.log('running mocha');
+        mocha.run(); 
+    }
+});

src/tsconfig.test.json

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Mocha</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="node_modules/mocha/mocha.css" />
+</head>
+
+<body>
+    <div id="mocha">
+        <p><a href="?">Index</a></p>
+    </div>
+    <div id="messages"></div>
+    <div id="fixtures"></div>
+    <script src="node_modules/mocha/mocha.js"></script>
+    <script>
+        mocha.setup('bdd');
+    </script>
+    <script data-main="test.config.js" src="node_modules/requirejs/require.js"></script>
+</body>
+</html>