From 8c5c795b35499996b057041c7cabd05f047fe9ae Mon Sep 17 00:00:00 2001 From: case Date: Fri, 15 Jan 2016 14:35:28 -0600 Subject: [PATCH 1/3] Remove Duplicate Require Statements and Unify Syntax on ' --- spec/atom-environment-spec.coffee | 2 +- spec/atom-portable-spec.coffee | 6 +++--- spec/atom-reporter.coffee | 1 - spec/babel-spec.coffee | 6 +++--- spec/buffered-node-process-spec.coffee | 2 +- spec/compile-cache-spec.coffee | 2 +- spec/default-directory-provider-spec.coffee | 6 +++--- spec/default-directory-searcher-spec.coffee | 6 +++--- spec/integration/helpers/start-atom.coffee | 16 ++++++++-------- spec/integration/startup-spec.coffee | 10 +++++----- spec/jasmine-test-runner.coffee | 1 - spec/project-spec.coffee | 1 - spec/tooltip-manager-spec.coffee | 2 +- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/spec/atom-environment-spec.coffee b/spec/atom-environment-spec.coffee index fd43a9616..b5b975112 100644 --- a/spec/atom-environment-spec.coffee +++ b/spec/atom-environment-spec.coffee @@ -1,4 +1,4 @@ -_ = require "underscore-plus" +_ = require 'underscore-plus' path = require 'path' temp = require 'temp' Package = require '../src/package' diff --git a/spec/atom-portable-spec.coffee b/spec/atom-portable-spec.coffee index 40c07fabe..0601ff126 100644 --- a/spec/atom-portable-spec.coffee +++ b/spec/atom-portable-spec.coffee @@ -1,7 +1,7 @@ -path = require "path" +path = require 'path' fs = require 'fs-plus' -temp = require "temp" -AtomPortable = require "../src/browser/atom-portable" +temp = require 'temp' +AtomPortable = require '../src/browser/atom-portable' portableModeCommonPlatformBehavior = (platform) -> describe "with ATOM_HOME environment variable", -> diff --git a/spec/atom-reporter.coffee b/spec/atom-reporter.coffee index 35caecb34..150eb9a4a 100644 --- a/spec/atom-reporter.coffee +++ b/spec/atom-reporter.coffee @@ -2,7 +2,6 @@ path = require 'path' _ = require 'underscore-plus' grim = require 'grim' marked = require 'marked' - listen = require '../src/delegated-listener' formatStackTrace = (spec, message='', stackTrace) -> diff --git a/spec/babel-spec.coffee b/spec/babel-spec.coffee index 3c4a4fe4b..da59360db 100644 --- a/spec/babel-spec.coffee +++ b/spec/babel-spec.coffee @@ -3,9 +3,9 @@ # See https://github.com/atom/electron/issues/2033 process.env.DEBUG='*' -path = require('path') -temp = require('temp').track() -CompileCache = require('../src/compile-cache') +path = require 'path' +temp = require('temp').track(); +CompileCache = require '../src/compile-cache' describe "Babel transpiler support", -> originalCacheDir = null diff --git a/spec/buffered-node-process-spec.coffee b/spec/buffered-node-process-spec.coffee index 1ea6074c5..61f3ef2cf 100644 --- a/spec/buffered-node-process-spec.coffee +++ b/spec/buffered-node-process-spec.coffee @@ -1,5 +1,5 @@ path = require 'path' -BufferedNodeProcess = require '../src/buffered-node-process' +BufferedNodeProcess = require '../src/buffered-node-process' describe "BufferedNodeProcess", -> it "executes the script in a new process", -> diff --git a/spec/compile-cache-spec.coffee b/spec/compile-cache-spec.coffee index 848da6b49..0c6ca0bf9 100644 --- a/spec/compile-cache-spec.coffee +++ b/spec/compile-cache-spec.coffee @@ -1,5 +1,5 @@ path = require 'path' -temp = require('temp').track() +temp = require('temp')track(); Babel = require 'babel-core' CoffeeScript = require 'coffee-script' {TypeScriptSimple} = require 'typescript-simple' diff --git a/spec/default-directory-provider-spec.coffee b/spec/default-directory-provider-spec.coffee index 357348c4a..df4f589b5 100644 --- a/spec/default-directory-provider-spec.coffee +++ b/spec/default-directory-provider-spec.coffee @@ -1,7 +1,7 @@ -DefaultDirectoryProvider = require "../src/default-directory-provider" -path = require "path" +DefaultDirectoryProvider = require '../src/default-directory-provider' +path = require 'path' fs = require 'fs-plus' -temp = require "temp" +temp = require 'temp' describe "DefaultDirectoryProvider", -> describe ".directoryForURISync(uri)", -> diff --git a/spec/default-directory-searcher-spec.coffee b/spec/default-directory-searcher-spec.coffee index 4e0b7321d..665e03409 100644 --- a/spec/default-directory-searcher-spec.coffee +++ b/spec/default-directory-searcher-spec.coffee @@ -1,6 +1,6 @@ -DefaultDirectorySearcher = require "../src/default-directory-searcher" -Task = require "../src/task" -path = require "path" +DefaultDirectorySearcher = require '../src/default-directory-searcher' +Task = require '../src/task' +path = require 'path' describe "DefaultDirectorySearcher", -> [searcher, dirPath] = [] diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee index b8768f532..3c1016ad2 100644 --- a/spec/integration/helpers/start-atom.coffee +++ b/spec/integration/helpers/start-atom.coffee @@ -1,11 +1,11 @@ -path = require "path" -http = require "http" -temp = require("temp").track() -remote = require "remote" -async = require "async" -{map, extend, once, difference} = require "underscore-plus" -{spawn, spawnSync} = require "child_process" -webdriverio = require "../../../build/node_modules/webdriverio" +path = require 'path' +http = require 'http' +temp = require('temp').track() +remote = require 'remote' +async = require 'async' +{map, extend, once, difference} = require 'underscore-plus' +{spawn, spawnSync} = require 'child_process' +webdriverio = require '../../../build/node_modules/webdriverio' AtomPath = remote.process.argv[0] AtomLauncherPath = path.join(__dirname, "..", "helpers", "atom-launcher.sh") diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee index da4e08ae2..6e8a7f55a 100644 --- a/spec/integration/startup-spec.coffee +++ b/spec/integration/startup-spec.coffee @@ -6,11 +6,11 @@ return unless process.env.ATOM_INTEGRATION_TESTS_ENABLED # run them on Travis. return if process.env.CI -fs = require "fs-plus" -path = require "path" -temp = require("temp").track() -runAtom = require "./helpers/start-atom" -CSON = require "season" +fs = require 'fs-plus' +path = require 'path' +temp = require('temp').track() +runAtom = require './helpers/start-atom' +CSON = require 'season' describe "Starting Atom", -> atomHome = temp.mkdirSync('atom-home') diff --git a/spec/jasmine-test-runner.coffee b/spec/jasmine-test-runner.coffee index 7ef34ce54..62b42d0a9 100644 --- a/spec/jasmine-test-runner.coffee +++ b/spec/jasmine-test-runner.coffee @@ -1,4 +1,3 @@ -fs = require 'fs' _ = require 'underscore-plus' fs = require 'fs-plus' path = require 'path' diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index 2c88aad50..9d42f9a7e 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -7,7 +7,6 @@ path = require 'path' BufferedProcess = require '../src/buffered-process' {Directory} = require 'pathwatcher' GitRepository = require '../src/git-repository' -temp = require "temp" describe "Project", -> beforeEach -> diff --git a/spec/tooltip-manager-spec.coffee b/spec/tooltip-manager-spec.coffee index bf0462ebf..87082504a 100644 --- a/spec/tooltip-manager-spec.coffee +++ b/spec/tooltip-manager-spec.coffee @@ -1,5 +1,5 @@ TooltipManager = require '../src/tooltip-manager' -_ = require "underscore-plus" +_ = require 'underscore-plus' describe "TooltipManager", -> [manager, element] = [] From a1c22c09f2f14306c211ef3eac34741c6bb01628 Mon Sep 17 00:00:00 2001 From: case Date: Fri, 15 Jan 2016 14:41:31 -0600 Subject: [PATCH 2/3] Remove Duplicate Require Statements and Unify Syntax on ' --- spec/compile-cache-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/compile-cache-spec.coffee b/spec/compile-cache-spec.coffee index 0c6ca0bf9..402817f32 100644 --- a/spec/compile-cache-spec.coffee +++ b/spec/compile-cache-spec.coffee @@ -1,5 +1,5 @@ path = require 'path' -temp = require('temp')track(); +temp = require('temp').track(); Babel = require 'babel-core' CoffeeScript = require 'coffee-script' {TypeScriptSimple} = require 'typescript-simple' From 59b8846667c5e82ce7b9520fb37029ebe1e02882 Mon Sep 17 00:00:00 2001 From: case Date: Fri, 15 Jan 2016 16:22:08 -0600 Subject: [PATCH 3/3] Remove Accidental Semicolons --- spec/babel-spec.coffee | 2 +- spec/compile-cache-spec.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/babel-spec.coffee b/spec/babel-spec.coffee index da59360db..3959a4753 100644 --- a/spec/babel-spec.coffee +++ b/spec/babel-spec.coffee @@ -4,7 +4,7 @@ process.env.DEBUG='*' path = require 'path' -temp = require('temp').track(); +temp = require('temp').track() CompileCache = require '../src/compile-cache' describe "Babel transpiler support", -> diff --git a/spec/compile-cache-spec.coffee b/spec/compile-cache-spec.coffee index 402817f32..848da6b49 100644 --- a/spec/compile-cache-spec.coffee +++ b/spec/compile-cache-spec.coffee @@ -1,5 +1,5 @@ path = require 'path' -temp = require('temp').track(); +temp = require('temp').track() Babel = require 'babel-core' CoffeeScript = require 'coffee-script' {TypeScriptSimple} = require 'typescript-simple'