From 2fe53d2f7ff1874486b7e8a076a2c8aaa6d272b8 Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Mon, 8 Dec 2014 11:39:55 +0100 Subject: [PATCH] style: trimming spaces --- karma.conf.js | 174 +++++++++++++++++------------------ tests/angular-localForage.js | 6 +- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index f872881..3749a78 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,100 +1,100 @@ var customLaunchers = { - sl_chrome: { - base: 'SauceLabs', - browserName: 'chrome' - }, - sl_firefox: { - base: 'SauceLabs', - browserName: 'firefox', - version: '30' - }, - sl_safari: { - base: 'SauceLabs', - browserName: 'safari', - platform: 'OS X 10.9', - version: '7' - }, - sl_ios_safari: { - base: 'SauceLabs', - browserName: 'iphone', - platform: 'OS X 10.9', - version: '7.1' - }, - sl_ie_9: { - base: 'SauceLabs', - browserName: 'internet explorer', - platform: 'Windows 2008', - version: '9' - }, - sl_ie_10: { - base: 'SauceLabs', - browserName: 'internet explorer', - platform: 'Windows 2012', - version: '10' - }, - sl_ie_11: { - base: 'SauceLabs', - browserName: 'internet explorer', - platform: 'Windows 8.1', - version: '11' - } + sl_chrome: { + base: 'SauceLabs', + browserName: 'chrome' + }, + sl_firefox: { + base: 'SauceLabs', + browserName: 'firefox', + version: '30' + }, + sl_safari: { + base: 'SauceLabs', + browserName: 'safari', + platform: 'OS X 10.9', + version: '7' + }, + sl_ios_safari: { + base: 'SauceLabs', + browserName: 'iphone', + platform: 'OS X 10.9', + version: '7.1' + }, + sl_ie_9: { + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows 2008', + version: '9' + }, + sl_ie_10: { + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows 2012', + version: '10' + }, + sl_ie_11: { + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows 8.1', + version: '11' + } }; module.exports = function(config) { - config.set(module.exports.conf); + config.set(module.exports.conf); - if(process.env.TRAVIS) { - config.sauceUser = process.env.SAUCE_USERNAME; - config.sauceKey = process.env.SAUCE_ACCESS_KEY; + if(process.env.TRAVIS) { + config.sauceUser = process.env.SAUCE_USERNAME; + config.sauceKey = process.env.SAUCE_ACCESS_KEY; - var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; + var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; - config.logLevel = config.LOG_DEBUG; - config.transports = ['websocket', 'xhr-polling']; - config.captureTimeout = 0; // rely on SL timeout + config.logLevel = config.LOG_DEBUG; + config.transports = ['websocket', 'xhr-polling']; + config.captureTimeout = 0; // rely on SL timeout - config.sauceLabs.build = buildLabel; - config.sauceLabs.startConnect = false; - config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER; - config.sauceLabs.recordScreenshots = true; + config.sauceLabs.build = buildLabel; + config.sauceLabs.startConnect = false; + config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER; + config.sauceLabs.recordScreenshots = true; - // TODO(vojta): remove once SauceLabs supports websockets. - // This speeds up the capturing a bit, as browsers don't even try to use websocket. - config.transports = ['xhr-polling']; - } + // TODO(vojta): remove once SauceLabs supports websockets. + // This speeds up the capturing a bit, as browsers don't even try to use websocket. + config.transports = ['xhr-polling']; + } }; module.exports.conf = { - frameworks: ['jasmine'], - files: [ - 'bower_components/angular/angular.js', - 'bower_components/angular-mocks/angular-mocks.js', - 'bower_components/localforage/dist/localforage.js', - 'src/angular-localForage.js', - 'tests/angular-localForage.js' - ], - autoWatch: false, - singleRun: true, - sauceLabs: { - testName: 'angular-localforage unit tests', - recordScreenshots: false, - startConnect: true, - options: { - 'selenium-version': '2.41.0' - }, - connectOptions: { - port: 5757, - logfile: 'sauce_connect.log' - } - }, - // Increase timeout in case connection in CI is slow - captureTimeout: 120000, - browserDisconnectTimeout: 10000, - browserDisconnectTolerance: 2, - browserNoActivityTimeout: 30000, - browsers: Object.keys(customLaunchers), - customLaunchers: customLaunchers, - reporters: ['progress', 'saucelabs'], - port: 9876, - colors: true + frameworks: ['jasmine'], + files: [ + 'bower_components/angular/angular.js', + 'bower_components/angular-mocks/angular-mocks.js', + 'bower_components/localforage/dist/localforage.js', + 'src/angular-localForage.js', + 'tests/angular-localForage.js' + ], + autoWatch: false, + singleRun: true, + sauceLabs: { + testName: 'angular-localforage unit tests', + recordScreenshots: false, + startConnect: true, + options: { + 'selenium-version': '2.41.0' + }, + connectOptions: { + port: 5757, + logfile: 'sauce_connect.log' + } + }, + // Increase timeout in case connection in CI is slow + captureTimeout: 120000, + browserDisconnectTimeout: 10000, + browserDisconnectTolerance: 2, + browserNoActivityTimeout: 30000, + browsers: Object.keys(customLaunchers), + customLaunchers: customLaunchers, + reporters: ['progress', 'saucelabs'], + port: 9876, + colors: true }; diff --git a/tests/angular-localForage.js b/tests/angular-localForage.js index c8e5d40..b149e59 100644 --- a/tests/angular-localForage.js +++ b/tests/angular-localForage.js @@ -22,7 +22,7 @@ describe('Module: LocalForageModule', function() { inject(function(_$rootScope_, _$localForage_) { $rootScope = _$rootScope_; $localForage = _$localForage_; - }) + }); }); afterEach(function(done) { @@ -61,7 +61,7 @@ describe('Module: LocalForageModule', function() { expect(typeof $localForage.getItem).toBe('function'); }); - it(' setItem and getItem should work', function(done) { + it('setItem and getItem should work', function(done) { var interval = triggerDigests(); $localForage.setItem('myName', 'Olivier Combe').then(function(data) { @@ -76,7 +76,7 @@ describe('Module: LocalForageModule', function() { }, done); }); - it(' setItem and getItem should work with an array of keys', function(done) { + it('setItem and getItem should work with an array of keys', function(done) { var interval = triggerDigests(), values = ['Olivier Combe', 'AngularJs', 'Open Source'];