From 2d7b217d95326fdbf8ffb3fbc73efae02bd94ac9 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 2 Oct 2015 12:45:33 -0700 Subject: [PATCH] linter runs after tests via jake --- Jakefile.js | 9 ++++++++- package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 943f2eff5ec..dcee5f7ef53 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -655,7 +655,14 @@ task("runtests", ["tests", builtLocalDirectory], function() { // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer var cmd = host + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run; console.log(cmd); - exec(cmd, deleteTemporaryProjectOutput); + exec(cmd, function() { + deleteTemporaryProjectOutput(); + var lint = jake.Task['lint']; + lint.addListener('complete', function () { + complete(); + }); + lint.invoke(); + }); }, {async: true}); desc("Generates code coverage data via instanbul"); diff --git a/package.json b/package.json index 607a38552ba..28f2c1b5755 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "scripts": { "pretest": "jake tests", - "test": "jake runtests && npm run lint", + "test": "jake runtests", "build": "npm run build:compiler && npm run build:tests", "build:compiler": "jake local", "build:tests": "jake tests",