Merge pull request #317 from johnnyreilly/master

More execution tests / started explicitly marking babel tests

test/comparison-tests/es6resolveParent/expectedOutput-2.0/output.txt → test/comparison-tests/babel-es6resolveParent/expectedOutput-2.0/output.txt

@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 349 bytes [rendered]
-    [0] ./.test/es6resolveParent/index.tsx 349 bytes {0} [built]
+    [0] ./.test/babel-es6resolveParent/index.tsx 349 bytes {0} [built]

test/comparison-tests/issue81/expectedOutput-2.0/output.txt → test/comparison-tests/babel-issue81/expectedOutput-2.0/output.txt

@@ -2,4 +2,4 @@
     bundle.js  2.76 kB       0  [emitted]  main
 bundle.js.map  1.66 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 1.23 kB [rendered]
-    [0] ./.test/issue81/a.ts 1.23 kB {0} [built]
+    [0] ./.test/babel-issue81/a.ts 1.23 kB {0} [built]

test/comparison-tests/issue92/expectedOutput-2.0/output.txt → test/comparison-tests/babel-issue92/expectedOutput-2.0/output.txt

@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.91 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 444 bytes [rendered]
-    [0] ./.test/issue92/app.ts 323 bytes {0} [built]
-    [1] ./.test/issue92/submodule/submodule.tsx 121 bytes {0} [built]
+    [0] ./.test/babel-issue92/app.ts 323 bytes {0} [built]
+    [1] ./.test/babel-issue92/submodule/submodule.tsx 121 bytes {0} [built]

test/comparison-tests/jsxPreserve/expectedOutput-2.0/output.txt → test/comparison-tests/babel-jsxPreserve/expectedOutput-2.0/output.txt

@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.28 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 808 bytes [rendered]
-    [0] ./.test/jsxPreserve/app.tsx 766 bytes {0} [built]
+    [0] ./.test/babel-jsxPreserve/app.tsx 766 bytes {0} [built]
     [1] external "react" 42 bytes {0} [not cacheable]

test/execution-tests/1.8.0_babel-allowSyntheticDefaultImports/src/simple.ts

@@ -0,0 +1,5 @@
+import mathutils from "mathutils";
+
+export function usingMathutils() {
+    return `with ${ mathutils.version } we can make ${ mathutils.adder(3, 4) }`;
+}

test/execution-tests/1.8.0_babel-allowSyntheticDefaultImports/test/simple.tests.ts

@@ -0,0 +1,7 @@
+import { usingMathutils } from "../src/simple";
+
+describe("simple", () => {
+  it("usingMathutils successfully uses the mathutils module", () => {
+    expect(usingMathutils()).toBe("with 1.2 we can make 7");
+  });
+});

test/execution-tests/1.8.0_babel-allowSyntheticDefaultImports/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "module": "es2015",
+    "noEmitOnError": false,
+    "noImplicitAny": true,
+    "preserveConstEnums": true,
+    "removeComments": false,
+    "suppressImplicitAnyIndexErrors": true,
+    "target": "es2015"
+  }
+}

test/execution-tests/1.8.0_babel-allowSyntheticDefaultImports/webpack.config.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-var, strict, prefer-arrow-callback */
+'use strict';
+
+var path = require('path');
+var webpack = require('webpack');
+
+module.exports = {
+  entry: './src/simple.ts',
+  output: {
+      filename: 'bundle.js'
+  },
+  module: {
+    loaders: [{
+      test: /\.ts(x?)$/,
+      exclude: /node_modules/,
+      loader: 'babel-loader?presets[]=es2015!ts-loader'
+    }, {
+      test: /\.js$/,
+      exclude: /node_modules/,
+      loader: 'babel',
+      query: {
+        presets: ['es2015']
+      }
+    }]
+  },
+  resolve: {
+    // Add `.ts` and `.tsx` as a resolvable extension.
+    extensions: ['', '.ts', '.tsx', '.js']
+  },
+};
+
+// for test harness purposes only, you would not need this in a normal project
+module.exports.resolveLoader = { alias: { 'ts-loader': path.join(__dirname, "../../../index.js") } }

test/execution-tests/babel-es6resolveParent/karma.conf.js

@@ -0,0 +1,55 @@
+/* eslint-disable no-var, strict */
+'use strict';
+var path = require('path');
+var webpack = require('webpack');
+var webpackConfig = require('./webpack.config.js');
+
+module.exports = function(config) {
+  config.set({
+    browsers: [ 'PhantomJS' ],
+
+    files: [
+      // This ensures we have the es6 shims in place from babel and then loads all the tests
+      'main.js'
+    ],
+
+    port: 9876,
+
+    frameworks: [ 'jasmine' ],
+
+    logLevel: config.LOG_INFO, //config.LOG_DEBUG
+
+    preprocessors: {
+      'main.js': [ 'webpack', 'sourcemap' ]
+    },
+
+    webpack: {
+      devtool: 'inline-source-map',
+      debug: true,
+      module: {
+          loaders: webpackConfig.module.loaders
+      },
+      resolve: webpackConfig.resolve,
+
+      // for test harness purposes only, you would not need this in a normal project
+      resolveLoader: webpackConfig.resolveLoader
+    },
+
+    webpackMiddleware: {
+      quiet: true,
+      stats: {
+        colors: true
+      }
+    },
+
+    // reporter options
+    mochaReporter: {
+      colors: {
+        success: 'bgGreen',
+        info: 'cyan',
+        warning: 'bgBlue',
+        error: 'bgRed'
+      }
+    }
+  });
+};

test/execution-tests/babel-es6resolveParent/main.js

@@ -0,0 +1,4 @@
+import 'babel-polyfill';
+
+const testsContext = require.context('./', true, /\.tests\.ts(x?)$/);
+testsContext.keys().forEach(testsContext);

test/execution-tests/babel-es6resolveParent/typings.json

@@ -0,0 +1,7 @@
+{
+  "name": "simple",
+  "version": false,
+  "globalDependencies": {
+    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#fe563dff3428bac1260d1794e2c2ecf8f097535a"
+  }
+}

test/execution-tests/basic/karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: [ 'PhantomJS' ],
 
     files: [
-      // This ensures we have the es6 shims in place from babel and then loads all the tests
+      // This loads all the tests
       'main.js'
     ],
 

test/execution-tests/codeSplitting/karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: [ 'PhantomJS' ],
 
     files: [
-      // This ensures we have the es6 shims in place from babel and then loads all the tests
+      // This loads all the tests
       'main.js'
     ],
 

test/execution-tests/nodeResolution/karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: [ 'PhantomJS' ],
 
     files: [
-      // This ensures we have the es6 shims in place from babel and then loads all the tests
+      // This loads all the tests
       'main.js'
     ],
 

test/execution-tests/simpleDependency/karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: [ 'PhantomJS' ],
 
     files: [
-      // This ensures we have the es6 shims in place from babel and then loads all the tests
+      // This loads all the tests
       'main.js'
     ],