From: John Reilly <johnny_reilly@hotmail.com>
Date: Sat, 20 Aug 2016 14:40:09 +0000 (+0100)
Subject: Moved to use Grunt approach to run TypeScript tests as suggested here: https://github... 
X-Git-Tag: 2.15.0~8^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52246f28d8796ec53344dd1bb312bf9dbf278f04;p=thirdparty%2Fmoment.git

Moved to use Grunt approach to run TypeScript tests as suggested here: https://github.com/moment/moment/pull/3282#issuecomment-239356967
---

diff --git a/.travis.yml b/.travis.yml
index fe0e70013..22958a0a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ before_script:
 
 script: grunt build:travis
 
-after_script:
-  - npm run test-typings
-
 git:
   depth: 10
 
diff --git a/Gruntfile.js b/Gruntfile.js
index 2bd77af7b..3d0e2defb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -177,6 +177,9 @@ module.exports = function (grunt) {
             },
             'meteor-publish': {
                 command: 'meteor publish'
+            },
+            'typescript-test': {
+                command: 'tsc --project typing-tests'
             }
         }
 
@@ -194,8 +197,9 @@ module.exports = function (grunt) {
     grunt.registerTask('lint', ['jshint', 'jscs']);
 
     // test tasks
-    grunt.registerTask('test', ['test:node']);
+    grunt.registerTask('test', ['test:node', 'test:typescript']);
     grunt.registerTask('test:node', ['transpile', 'qtest']);
+    grunt.registerTask('test:typescript', ['exec:typescript-test']);
     // TODO: For some weird reason karma doesn't like the files in
     // build/umd/min/* but works with min/*, so update-index, then git checkout
     grunt.registerTask('test:server', ['transpile', 'update-index', 'karma:server']);
diff --git a/package.json b/package.json
index b277f2352..f0e6ec5eb 100644
--- a/package.json
+++ b/package.json
@@ -85,8 +85,7 @@
         }
     },
     "scripts": {
-        "test-typings": "tsc --project typing-tests",
-        "test": "grunt test && npm run test-typings",
+        "test": "grunt test",
         "coverage": "nyc npm test && nyc report",
         "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
     },