From 4beede553ddf2e901eae56e470d801ddd374ea47 Mon Sep 17 00:00:00 2001 From: Baraa Hamodi Date: Sat, 30 May 2015 13:50:53 -0700 Subject: [PATCH] Configured eslint to work on the grunt directory and applied lint fixes. --- grunt/aliases.js | 2 +- grunt/clean.js | 2 +- grunt/coveralls.js | 4 ++-- grunt/eslint.js | 2 +- grunt/karma.js | 12 ++++++------ grunt/sauce.js | 29 +++++++++++++---------------- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/grunt/aliases.js b/grunt/aliases.js index cd89347..d305adb 100644 --- a/grunt/aliases.js +++ b/grunt/aliases.js @@ -15,4 +15,4 @@ module.exports = { 'coveralls', //'sauce', TODO: investigate why sauce connect isnt working ], -}; +} diff --git a/grunt/clean.js b/grunt/clean.js index 29692d7..f2ba0fa 100644 --- a/grunt/clean.js +++ b/grunt/clean.js @@ -1,4 +1,4 @@ module.exports = { coverage: ['coverage/**'], dist: ['dist/**'], -}; +} diff --git a/grunt/coveralls.js b/grunt/coveralls.js index 4f52507..868dfb9 100644 --- a/grunt/coveralls.js +++ b/grunt/coveralls.js @@ -2,5 +2,5 @@ module.exports = { options: { debug: true, coverageDir: 'coverage', - } -}; + }, +} diff --git a/grunt/eslint.js b/grunt/eslint.js index b8a37b5..1e09b49 100644 --- a/grunt/eslint.js +++ b/grunt/eslint.js @@ -2,5 +2,5 @@ module.exports = { options: { configFile: '.eslintrc', }, - target: ['src/*', 'tests/*'], + target: ['src/*', 'tests/*', 'grunt/*'], } diff --git a/grunt/karma.js b/grunt/karma.js index d36be1f..b8d8df4 100644 --- a/grunt/karma.js +++ b/grunt/karma.js @@ -1,5 +1,5 @@ var sauce = require('./sauce') -var path = require('path'); +var path = require('path') module.exports = { options: { @@ -60,7 +60,7 @@ module.exports = { { type: 'html', dir: 'coverage/' }, { type: 'lcov', dir: 'coverage/' }, { type: 'text-summary' }, - ] + ], }, webpack: { @@ -72,9 +72,9 @@ module.exports = { { test: /\.js$/, exclude: /(node_modules\/|-tests\.js$)/, - loader: 'istanbul-instrumenter' - } - ] + loader: 'istanbul-instrumenter', + }, + ], }, }, }, @@ -90,4 +90,4 @@ module.exports = { sauce_mobile: { options: sauce.mobile, }, -}; +} diff --git a/grunt/sauce.js b/grunt/sauce.js index 73179f4..777f2db 100644 --- a/grunt/sauce.js +++ b/grunt/sauce.js @@ -1,5 +1,3 @@ -var path = require('path'); -// stolen from https://github.com/yyx990803/vue/blob/master/grunt/sauce.js var sauceConfig = { username: 'nuclearjs', accessKey: process.env.SAUCE_ACCESS_KEY, @@ -13,7 +11,6 @@ var sauceConfig = { * causes timeouts and errors, so we have to run them in * smaller batches. */ - var batches = { // the cool kids modern: { @@ -21,19 +18,19 @@ var batches = { base: 'SauceLabs', browserName: 'chrome', platform: 'Windows 7', - version: '39' + version: '39', }, sl_firefox: { base: 'SauceLabs', browserName: 'firefox', - version: '33' + version: '33', }, sl_mac_safari: { base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.10', - version: '8' - } + version: '8', + }, }, // ie family ie: { @@ -41,20 +38,20 @@ var batches = { base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 7', - version: '9' + version: '9', }, sl_ie_10: { base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8', - version: '10' + version: '10', }, sl_ie_11: { base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', - version: '11' - } + version: '11', + }, }, // mobile mobile: { @@ -62,15 +59,15 @@ var batches = { base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.9', - version: '8.1' + version: '8.1', }, sl_android: { base: 'SauceLabs', browserName: 'android', platform: 'Linux', - version: '4.2' - } - } + version: '4.2', + }, + }, } for (var key in batches) { @@ -81,6 +78,6 @@ for (var key in batches) { browserNoActivityTimeout: 300000, customLaunchers: batches[key], browsers: Object.keys(batches[key]), - reporters: ['progress', 'saucelabs'] + reporters: ['progress', 'saucelabs'], } }