From 13a19f520a1f61b720136f5540c437e28b8ce192 Mon Sep 17 00:00:00 2001 From: Baraa Hamodi Date: Mon, 1 Jun 2015 17:03:44 -0700 Subject: [PATCH 1/2] Fixed last 10 lint warnings. --- grunt/sauce.js | 9 +++++---- src/utils.js | 4 ++-- tests/evaluator-tests.js | 12 ++++++------ tests/store-tests.js | 6 +++--- tests/utils-tests.js | 2 ++ 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/grunt/sauce.js b/grunt/sauce.js index 777f2db..f824463 100644 --- a/grunt/sauce.js +++ b/grunt/sauce.js @@ -1,3 +1,4 @@ +var each = require('../src/utils').each var sauceConfig = { username: 'nuclearjs', accessKey: process.env.SAUCE_ACCESS_KEY, @@ -70,14 +71,14 @@ var batches = { }, } -for (var key in batches) { +each(batches, function(value, key) { exports[key] = { sauceLabs: sauceConfig, // mobile emulators are really slow captureTimeout: 300000, browserNoActivityTimeout: 300000, - customLaunchers: batches[key], - browsers: Object.keys(batches[key]), + customLaunchers: value, + browsers: Object.keys(value), reporters: ['progress', 'saucelabs'], } -} +}) diff --git a/src/utils.js b/src/utils.js index d022335..5c7df7a 100644 --- a/src/utils.js +++ b/src/utils.js @@ -105,8 +105,8 @@ exports.each = function(collection, iteratee, context) { if (context) { origIteratee = iteratee - iteratee = function(value, index, collection) { - return origIteratee.call(context, value, index, collection) + iteratee = function(value, index, inner_collection) { + return origIteratee.call(context, value, index, inner_collection) } } diff --git a/tests/evaluator-tests.js b/tests/evaluator-tests.js index dc8e49b..46605d7 100644 --- a/tests/evaluator-tests.js +++ b/tests/evaluator-tests.js @@ -87,9 +87,9 @@ describe('Evaluator', () => { currentProjectGetter = [ ['projects'], ['session', 'currentProjectId'], - (projects, currentProjectId) => { + (all_projects, currentProjectId) => { currentProjectSpy() - return projects.get(currentProjectId) + return all_projects.get(currentProjectId) }, ] currentProjectDescriptionGetter = [ @@ -126,7 +126,7 @@ describe('Evaluator', () => { it('should prevent nested evaluate calls', () => { var nestedEvaluateGetter = [ currentProjectGetter, - (projects) => { + () => { return evaluator.evaluate(state, currentProjectDescriptionGetter) }, ] @@ -168,8 +168,8 @@ describe('Evaluator', () => { var currentProjectGetter = [ ['projects'], ['session', 'currentProjectId'], - (projects, currentProjectId) => { - return projects.get(currentProjectId) + (all_projects, currentProjectId) => { + return all_projects.get(currentProjectId) }, ] @@ -179,7 +179,7 @@ describe('Evaluator', () => { var result2 = evaluator.evaluate(state, currentProjectGetter) expect(result2).toBe(proj1) // update state test the `hasStaleValue` codepath - var state1 = state.update('projects', projects => projects.set(3, proj3)) + var state1 = state.update('projects', all_projects => all_projects.set(3, proj3)) var result3 = evaluator.evaluate(state1, currentProjectGetter) expect(result3).toBe(proj1) diff --git a/tests/store-tests.js b/tests/store-tests.js index 5223a36..b7e6403 100644 --- a/tests/store-tests.js +++ b/tests/store-tests.js @@ -20,11 +20,11 @@ describe('Store', () => { initialize: function() { this.on('addExperiments', (state, payload) => { - return state.withMutations(state => { + return state.withMutations(innerState => { payload.data.forEach(item => { - state.setIn(['experiments', item.id], Map(item)) + innerState.setIn(['experiments', item.id], Map(item)) }) - return state + return innerState }) }) diff --git a/tests/utils-tests.js b/tests/utils-tests.js index d8b9ef7..83296fb 100644 --- a/tests/utils-tests.js +++ b/tests/utils-tests.js @@ -116,9 +116,11 @@ describe('Utils', () => { }) it('identifies instances as Object types', () => { + /* eslint-disable no-new-wrappers */ expect(Utils.isObject(new Number(0))).toBe(true) expect(Utils.isObject(new String(''))).toBe(true) expect(Utils.isObject(new Boolean(''))).toBe(true) + /* eslint-enable no-new-wrappers */ }) }) From 9c56ec172c3769c3c3c192b796355f227c3d93f6 Mon Sep 17 00:00:00 2001 From: Baraa Hamodi Date: Mon, 1 Jun 2015 17:07:25 -0700 Subject: [PATCH 2/2] Camel case variables. --- src/utils.js | 4 ++-- tests/evaluator-tests.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/utils.js b/src/utils.js index 5c7df7a..a65dfc5 100644 --- a/src/utils.js +++ b/src/utils.js @@ -105,8 +105,8 @@ exports.each = function(collection, iteratee, context) { if (context) { origIteratee = iteratee - iteratee = function(value, index, inner_collection) { - return origIteratee.call(context, value, index, inner_collection) + iteratee = function(value, index, innerCollection) { + return origIteratee.call(context, value, index, innerCollection) } } diff --git a/tests/evaluator-tests.js b/tests/evaluator-tests.js index 46605d7..97c2239 100644 --- a/tests/evaluator-tests.js +++ b/tests/evaluator-tests.js @@ -87,9 +87,9 @@ describe('Evaluator', () => { currentProjectGetter = [ ['projects'], ['session', 'currentProjectId'], - (all_projects, currentProjectId) => { + (allProjects, currentProjectId) => { currentProjectSpy() - return all_projects.get(currentProjectId) + return allProjects.get(currentProjectId) }, ] currentProjectDescriptionGetter = [ @@ -168,8 +168,8 @@ describe('Evaluator', () => { var currentProjectGetter = [ ['projects'], ['session', 'currentProjectId'], - (all_projects, currentProjectId) => { - return all_projects.get(currentProjectId) + (allProjects, currentProjectId) => { + return allProjects.get(currentProjectId) }, ] @@ -179,7 +179,7 @@ describe('Evaluator', () => { var result2 = evaluator.evaluate(state, currentProjectGetter) expect(result2).toBe(proj1) // update state test the `hasStaleValue` codepath - var state1 = state.update('projects', all_projects => all_projects.set(3, proj3)) + var state1 = state.update('projects', allProjects => allProjects.set(3, proj3)) var result3 = evaluator.evaluate(state1, currentProjectGetter) expect(result3).toBe(proj1)