regenerate output for 2.6 and add 2.6 to test matrix

TypeStrong · Nov 4, 2017 · 0951587 · 0951587
1 parent 512c9e6
commit 0951587
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,9 @@ install:
   - yarn build
   - yarn add $TYPESCRIPT
 env:
-  - TYPESCRIPT=typescript@2.5.2
+  - TYPESCRIPT=typescript@2.6.1
   - TYPESCRIPT=typescript@next
+  - TYPESCRIPT=typescript@2.5.2
   - TYPESCRIPT=typescript@2.4.1
   - TYPESCRIPT=typescript@2.3.1
   - TYPESCRIPT=typescript@2.2.1

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,8 +3,9 @@ environment:
   FORCE_COLOR: 1
   nodejs_version: "8"
   matrix:
-  - TYPESCRIPT: typescript@2.5.2
+  - TYPESCRIPT: typescript@2.6.1
   - TYPESCRIPT: typescript@next
+  - TYPESCRIPT: typescript@2.5.2
   - TYPESCRIPT: typescript@2.4.1
   - TYPESCRIPT: typescript@2.3.1
   - TYPESCRIPT: typescript@2.2.1

diff --git a/test/comparison-tests/instance/expectedOutput-2.6/output.transpiled.txt b/test/comparison-tests/instance/expectedOutput-2.6/output.transpiled.txt
@@ -3,10 +3,10 @@ bundle.js  2.66 kB       0  [emitted]  b
    [0] ./.test/instance/a.ts 177 bytes {1} [built] [failed] [1 error]
    [1] ./.test/instance/b.ts 177 bytes {0} [built] [failed] [1 error]
 
-ERROR in ./.test/instance/a.ts
+ERROR in ./.test/instance/b.ts
 Module build failed: [31mA file specified in tsconfig.json could not be found: i-dont-exist[39m
 
-ERROR in ./.test/instance/b.ts
+ERROR in ./.test/instance/a.ts
 Module build failed: [31mA file specified in tsconfig.json could not be found: i-dont-exist[39m
 
 ERROR in chunk a [entry]

diff --git a/test/comparison-tests/run-tests.js b/test/comparison-tests/run-tests.js
@@ -7,7 +7,7 @@ var execSync = require('child_process').execSync;
 
 // We only want to run comparison tests for the latest released version
 var typescriptVersion = parseFloat(semver.major(typescript.version) + '.' + semver.minor(typescript.version));
-if (typescriptVersion < 2.5  || typescriptVersion > 2.5) return;
+if (typescriptVersion < 2.6  || typescriptVersion > 2.6) return;
 
 // Parse command line arguments
 var saveOutputMode = process.argv.indexOf('--save-output') !== -1;

diff --git a/test/comparison-tests/validateLoaderOptionNames/expectedOutput-2.6/output.txt b/test/comparison-tests/validateLoaderOptionNames/expectedOutput-2.6/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  3.15 kB       0  [emitted]  main
-   [0] ./.test/validateLoaderOptionNames/app.ts 676 bytes {0} [built] [failed] [1 error]
+bundle.js  3.17 kB       0  [emitted]  main
+   [0] ./.test/validateLoaderOptionNames/app.ts 702 bytes {0} [built] [failed] [1 error]
 
 ERROR in ./.test/validateLoaderOptionNames/app.ts
 Module build failed: Error: ts-loader was supplied with an unexpected loader option: notRealOption