]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Moved to use Grunt approach to run TypeScript tests as suggested here: https://github...
authorJohn Reilly <johnny_reilly@hotmail.com>
Sat, 20 Aug 2016 14:40:09 +0000 (15:40 +0100)
committerIskren Chernev <iskren.chernev@gmail.com>
Wed, 7 Sep 2016 06:11:49 +0000 (23:11 -0700)
.travis.yml
Gruntfile.js
package.json

index fe0e70013f51ab8623917c9e54b6cdc1f5e110ca..22958a0a9e4a81487a667c86fa6f58b30e7670a6 100644 (file)
@@ -15,9 +15,6 @@ before_script:
 
 script: grunt build:travis
 
-after_script:
-  - npm run test-typings
-
 git:
   depth: 10
 
index 2bd77af7bc7aef5c17ad245b769ebc51a161b0c2..3d0e2defb954586f3c146a3abd697b6d9c29b76a 100644 (file)
@@ -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']);
index b277f2352b1d92e586962022f0c5fca67c5d3240..f0e6ec5eb666ef1755816485f807384f02e587af 100644 (file)
@@ -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"
     },