From e64119ade2d48aafcdb3f694b00d131cc3924b07 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 3 Sep 2013 16:59:49 -0700 Subject: [PATCH] Rename specPath loadSetting to specDirectory --- spec/spec-suite.coffee | 2 +- src/atom-application.coffee | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee index b7b69a400..e59be8617 100644 --- a/spec/spec-suite.coffee +++ b/spec/spec-suite.coffee @@ -44,7 +44,7 @@ measure 'spec suite require time', -> requireSpecs(specPath) setSpecType("user") - if specPath = atom.getLoadSettings().specPath runSpecs(specPath) + if specDirectory = atom.getLoadSettings().specDirectory else runAllSpecs() diff --git a/src/atom-application.coffee b/src/atom-application.coffee index 06126cbb8..82f4ab51b 100644 --- a/src/atom-application.coffee +++ b/src/atom-application.coffee @@ -157,8 +157,8 @@ class AtomApplication ipc.once 'update-application-menu', (processId, routingId, keystrokesByCommand) => @applicationMenu.update(keystrokesByCommand) - ipc.on 'run-package-specs', (processId, routingId, packagePath) => - @runSpecs({resourcePath: global.devResourcePath, specPath: packagePath, exitWhenDone: false}) + ipc.on 'run-package-specs', (processId, routingId, specDirectory) => + @runSpecs({resourcePath: global.devResourcePath, specDirectory: specDirectory, exitWhenDone: false}) ipc.on 'command', (processId, routingId, command) => @emit(command) @@ -264,14 +264,14 @@ class AtomApplication # The path to include specs from. # + specPath: # The directory to load specs from. - runSpecs: ({exitWhenDone, resourcePath, specPath}) -> + runSpecs: ({exitWhenDone, resourcePath, specDirectory}) -> if resourcePath isnt @resourcePath and not fs.existsSync(resourcePath) resourcePath = @resourcePath bootstrapScript = 'spec-bootstrap' isSpec = true devMode = true - new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specPath}) + new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory}) runBenchmarks: -> bootstrapScript = 'benchmark/benchmark-bootstrap'