Merge a5049ea into 8f7168d

.markdown-doctest-setup.js

@@ -1,7 +1,7 @@
 'use strict';
 var Rx = require(__dirname);
 
-var marbleTesting = require('./spec/helpers/marble-testing');
+var marbleTesting = require('./tmp/helpers/marble-testing');
 
 global.rxTestScheduler = new Rx.TestScheduler(marbleTesting.assertDeepEqual);
 

karma.conf.js

@@ -137,10 +137,10 @@ module.exports = function (config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'spec/helpers/marble-testing.js',
-      'spec/helpers/test-helper.js',
-      'spec/helpers/ajax-helper.js',
-      'spec/**/*-spec.js'
+      'tmp/helpers/marble-testing.js',
+      'tmp/helpers/test-helper.js',
+      'tmp/helpers/ajax-helper.js',
+      'tmp/**/*-spec.js'
     ],
 
     // list of files to exclude
@@ -150,7 +150,7 @@ module.exports = function (config) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'spec/**/*.js': ['browserify']
+      'tmp/**/*.js': ['browserify']
     },
 
     // test results reporter to use

package.json

@@ -24,13 +24,15 @@
     "build_cover": "rm -rf dist/ && npm run lint && npm run build_cjs && npm run cover",
     "build_docs": "./docgen.sh",
     "lint_perf": "eslint perf/",
-    "lint_spec": "eslint spec/",
+    "lint_spec": "tslint -c tslint.json spec/*.ts spec/**/*.ts spec/**/**/*.ts",
     "lint_src": "tslint -c tslint.json src/*.ts src/**/*.ts src/**/**/*.ts",
     "lint": "npm run lint_src && npm run lint_spec && npm run lint_perf",
     "copy_src": "cp -r src/ dist/cjs/src && cp -r src/ dist/amd/src && cp -r src/ dist/es6/src",
-    "cover": "istanbul cover -x \"*-spec.js index.js *-helper.js spec/helpers/*\" ./node_modules/jasmine/bin/jasmine.js && npm run cover_remapping",
+    "cover": "istanbul cover -x \"*-spec.js index.js *-helper.js tmp/helpers/*\" ./node_modules/jasmine/bin/jasmine.js && npm run cover_remapping",
     "cover_remapping": "remap-istanbul -b ./ -i coverage/coverage.json -o coverage/coverage-remapped.json && remap-istanbul -b ./ -i coverage/coverage.json -o coverage/coverage-remapped.lcov -t lcovonly && remap-istanbul -b ./ -i coverage/coverage.json -o coverage/coverage-remapped -t html",
-    "test": "jasmine",
+    "test_nobuild": "jasmine",
+    "test_buildonly": "rm -rf tmp && tsc --project ./spec --pretty",
+    "test": "npm run test_buildonly && npm run test_nobuild",
     "test_karma": "karma start karma.conf.js",
     "tests2png": "mkdirp tmp/docs/img && JASMINE_CONFIG_PATH=spec/support/tests2png.json jasmine",
     "watch": "watch \"echo triggering build && npm run build_test && echo build completed\" src -d -u -w=15",