JS Static tests added to CI (ESLint + JSCS)

.travis.yml

@@ -39,7 +39,4 @@ matrix:
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
-script:
-  - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
-  - if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE == "js" ]; then grunt spec; fi
+script: ./dev/travis/script.sh

dev/tools/grunt/configs/eslint.json

@@ -0,0 +1,18 @@
+{
+    "file": {
+        "options": {
+            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+            "reset": true,
+            "useEslintrc": false
+        }
+    },
+    "test": {
+        "options": {
+            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+            "reset": true,
+            "outputFile": "dev/tests/static/eslint-error-report.xml",
+            "format": "junit",
+            "quiet": true
+        }
+    }
+}

dev/tools/grunt/tasks/static.js

@@ -17,7 +17,7 @@ module.exports = function (grunt) {
         };
 
     grunt.registerTask('static', function (target) {
-        var currentTarget = target || 'test',
+        var currentTarget = target || 'file',
             file = grunt.option('file'),
             tasks = [
                 'eslint:' + currentTarget,
@@ -26,7 +26,11 @@ module.exports = function (grunt) {
 
         setConfig('eslint', currentTarget, cvf.getFiles(file));
         setConfig('jscs', currentTarget, cvf.getFiles(file));
-        grunt.option('force', true);
+
+        if (grunt.option('force') !== false) {
+            grunt.option('force', false);
+        }
+
         grunt.task.run(tasks);
 
         if (!grunt.option('file')) {

dev/travis/before_install.sh

@@ -19,3 +19,17 @@ phpenv rehash;
 
 # If env var is present, configure support for 3rd party builds which include private dependencies
 test -n "$GITHUB_TOKEN" && composer config github-oauth.github.com "$GITHUB_TOKEN" || true
+
+# Node.js setup via NVM
+if [ $TEST_SUITE = "static" ] || [ test $TEST_SUITE == "js" ]; then
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
+    export NVM_DIR="$HOME/.nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
+
+    nvm install $NODE_JS_VERSION
+    nvm use $NODE_JS_VERSION
+    node --version
+
+    npm install -g yarn
+    yarn global add grunt-cli
+fi

dev/travis/before_script.sh

@@ -75,19 +75,14 @@ case $TEST_SUITE in
         cat "$changed_files_ce" | sed 's/^/  + including /'
 
         cd ../../..
+
+        cp package.json.sample package.json
+        cp Gruntfile.js.sample Gruntfile.js
+        yarn
         ;;
     js)
-        curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
-        export NVM_DIR="$HOME/.nvm"
-        [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
-        nvm install $NODE_JS_VERSION
-        nvm use $NODE_JS_VERSION
-        node --version
-
         cp package.json.sample package.json
         cp Gruntfile.js.sample Gruntfile.js
-        npm install -g yarn
-        yarn global add grunt-cli
         yarn
 
         echo "Installing Magento"

dev/travis/script.sh

@@ -0,0 +1,10 @@
+case $TEST_SUITE in
+    static)
+        TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
+        phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER
+        grunt static --force=false
+        ;;
+    js)
+        grunt spec
+        ;;
+esac