Move spec files back out of spec/javascripts

- Jasmine gem allows us to specify a path to jasmine.yml via ENV [finish #58126010]
2013-10-02 16:32:35 -07:00
parent fc258b3d36
commit 1c19b8e38a
54 changed files with 9 additions and 2 deletions
--- a/spec/javascripts/console/ConsoleReporterSpec.js
+++ b/spec/javascripts/console/ConsoleReporterSpec.js
--- a/spec/javascripts/core/AnySpec.js
+++ b/spec/javascripts/core/AnySpec.js
--- a/spec/javascripts/core/CallTrackerSpec.js
+++ b/spec/javascripts/core/CallTrackerSpec.js
--- a/spec/javascripts/core/ClockSpec.js
+++ b/spec/javascripts/core/ClockSpec.js
--- a/spec/javascripts/core/CustomMatchersSpec.js
+++ b/spec/javascripts/core/CustomMatchersSpec.js
--- a/spec/javascripts/core/DelayedFunctionSchedulerSpec.js
+++ b/spec/javascripts/core/DelayedFunctionSchedulerSpec.js
--- a/spec/javascripts/core/EnvSpec.js
+++ b/spec/javascripts/core/EnvSpec.js
--- a/spec/javascripts/core/ExceptionFormatterSpec.js
+++ b/spec/javascripts/core/ExceptionFormatterSpec.js
--- a/spec/javascripts/core/ExceptionsSpec.js
+++ b/spec/javascripts/core/ExceptionsSpec.js
--- a/spec/javascripts/core/ExpectationResultSpec.js
+++ b/spec/javascripts/core/ExpectationResultSpec.js
--- a/spec/javascripts/core/ExpectationSpec.js
+++ b/spec/javascripts/core/ExpectationSpec.js
--- a/spec/javascripts/core/JsApiReporterSpec.js
+++ b/spec/javascripts/core/JsApiReporterSpec.js
--- a/spec/javascripts/core/ObjectContainingSpec.js
+++ b/spec/javascripts/core/ObjectContainingSpec.js
--- a/spec/javascripts/core/PrettyPrintSpec.js
+++ b/spec/javascripts/core/PrettyPrintSpec.js
--- a/spec/javascripts/core/QueueRunnerSpec.js
+++ b/spec/javascripts/core/QueueRunnerSpec.js
--- a/spec/javascripts/core/ReportDispatcherSpec.js
+++ b/spec/javascripts/core/ReportDispatcherSpec.js
--- a/spec/javascripts/core/SpecRunningSpec.js
+++ b/spec/javascripts/core/SpecRunningSpec.js
--- a/spec/javascripts/core/SpecSpec.js
+++ b/spec/javascripts/core/SpecSpec.js
--- a/spec/javascripts/core/SpySpec.js
+++ b/spec/javascripts/core/SpySpec.js
--- a/spec/javascripts/core/SpyStrategySpec.js
+++ b/spec/javascripts/core/SpyStrategySpec.js
--- a/spec/javascripts/core/SuiteSpec.js
+++ b/spec/javascripts/core/SuiteSpec.js
--- a/spec/javascripts/core/TimerSpec.js
+++ b/spec/javascripts/core/TimerSpec.js
--- a/spec/javascripts/core/UtilSpec.js
+++ b/spec/javascripts/core/UtilSpec.js
--- a/spec/javascripts/core/matchers/matchersUtilSpec.js
+++ b/spec/javascripts/core/matchers/matchersUtilSpec.js
--- a/spec/javascripts/core/matchers/toBeCloseToSpec.js
+++ b/spec/javascripts/core/matchers/toBeCloseToSpec.js
--- a/spec/javascripts/core/matchers/toBeDefinedSpec.js
+++ b/spec/javascripts/core/matchers/toBeDefinedSpec.js
--- a/spec/javascripts/core/matchers/toBeFalsySpec.js
+++ b/spec/javascripts/core/matchers/toBeFalsySpec.js
--- a/spec/javascripts/core/matchers/toBeGreaterThanSpec.js
+++ b/spec/javascripts/core/matchers/toBeGreaterThanSpec.js
--- a/spec/javascripts/core/matchers/toBeLessThanSpec.js
+++ b/spec/javascripts/core/matchers/toBeLessThanSpec.js
--- a/spec/javascripts/core/matchers/toBeNaNSpec.js
+++ b/spec/javascripts/core/matchers/toBeNaNSpec.js
--- a/spec/javascripts/core/matchers/toBeNullSpec.js
+++ b/spec/javascripts/core/matchers/toBeNullSpec.js
--- a/spec/javascripts/core/matchers/toBeSpec.js
+++ b/spec/javascripts/core/matchers/toBeSpec.js
--- a/spec/javascripts/core/matchers/toBeTruthySpec.js
+++ b/spec/javascripts/core/matchers/toBeTruthySpec.js
--- a/spec/javascripts/core/matchers/toBeUndefinedSpec.js
+++ b/spec/javascripts/core/matchers/toBeUndefinedSpec.js
--- a/spec/javascripts/core/matchers/toContainSpec.js
+++ b/spec/javascripts/core/matchers/toContainSpec.js
--- a/spec/javascripts/core/matchers/toEqualSpec.js
+++ b/spec/javascripts/core/matchers/toEqualSpec.js
--- a/spec/javascripts/core/matchers/toHaveBeenCalledSpec.js
+++ b/spec/javascripts/core/matchers/toHaveBeenCalledSpec.js
--- a/spec/javascripts/core/matchers/toHaveBeenCalledWithSpec.js
+++ b/spec/javascripts/core/matchers/toHaveBeenCalledWithSpec.js
--- a/spec/javascripts/core/matchers/toMatchSpec.js
+++ b/spec/javascripts/core/matchers/toMatchSpec.js
--- a/spec/javascripts/core/matchers/toThrowErrorSpec.js
+++ b/spec/javascripts/core/matchers/toThrowErrorSpec.js
--- a/spec/javascripts/core/matchers/toThrowSpec.js
+++ b/spec/javascripts/core/matchers/toThrowSpec.js
--- a/spec/javascripts/helpers/BrowserFlags.js
+++ b/spec/javascripts/helpers/BrowserFlags.js
--- a/spec/javascripts/html/HtmlReporterSpec.js
+++ b/spec/javascripts/html/HtmlReporterSpec.js
--- a/spec/javascripts/html/HtmlSpecFilterSpec.js
+++ b/spec/javascripts/html/HtmlSpecFilterSpec.js
--- a/spec/javascripts/html/MatchersHtmlSpec.js
+++ b/spec/javascripts/html/MatchersHtmlSpec.js
--- a/spec/javascripts/html/PrettyPrintHtmlSpec.js
+++ b/spec/javascripts/html/PrettyPrintHtmlSpec.js
--- a/spec/javascripts/html/QueryStringSpec.js
+++ b/spec/javascripts/html/QueryStringSpec.js
--- a/spec/javascripts/html/ResultsNodeSpec.js
+++ b/spec/javascripts/html/ResultsNodeSpec.js
--- a/spec/javascripts/performance/performance_test.js
+++ b/spec/javascripts/performance/performance_test.js
--- a/spec/javascripts/support/dev_boot.js
+++ b/spec/javascripts/support/dev_boot.js
--- a/spec/javascripts/support/jasmine-performance.yml
+++ b/spec/javascripts/support/jasmine-performance.yml
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -15,13 +15,13 @@ src_files:
  - 'html/**.js'
  - '**/*.js'
 stylesheets:
-boot_dir: 'spec/javascripts/support'
+boot_dir: 'spec/support'
 boot_files:
  - 'dev_boot.js'
 helpers:
  - 'helpers/**/*.js'
 spec_files:
  - '**/*[Ss]pec.js'
-spec_dir:
+spec_dir: spec


--- a/spec/javascripts/support/jasmine_selenium_runner.yml
+++ b/spec/javascripts/support/jasmine_selenium_runner.yml