aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2011-07-01 17:34:12 -0700
committerIgor Minar2011-07-01 18:17:42 -0700
commit25a77c58c13e4df37c29245bec0f7716e20f3c15 (patch)
tree00f7d7cae267a8f03817f401f7bf59360c6230bc
parent75721223b56f8fa02958690dcc9c2f2445271b98 (diff)
downloadangular.js-25a77c58c13e4df37c29245bec0f7716e20f3c15.tar.bz2
fix:jstd.conf: explicitly specify script load order
Originally we relied on a lot of globbing, which resulted in angular-mocks being loaded before normal services, so we never overwrote services like $exceptionHandler with mocks. Explict definition guarantees that we don't fall into the loading order trap, but requires us to remember to update the jsTestDriver.conf file every time we add/rename/remove a js file.
-rw-r--r--jsTestDriver-coverage.conf34
-rw-r--r--jsTestDriver-jquery.conf34
-rw-r--r--jsTestDriver-perf.conf34
-rw-r--r--jsTestDriver.conf34
4 files changed, 128 insertions, 8 deletions
diff --git a/jsTestDriver-coverage.conf b/jsTestDriver-coverage.conf
index 2021e740..b62212b4 100644
--- a/jsTestDriver-coverage.conf
+++ b/jsTestDriver-coverage.conf
@@ -7,8 +7,38 @@ load:
- test/jquery_remove.js
- src/Angular.js
- src/JSON.js
- - src/*.js
- - src/service/*.js
+ - src/Compiler.js
+ - src/Scope.js
+ - src/Injector.js
+ - src/parser.js
+ - src/Resource.js
+ - src/Browser.js
+ - src/sanitizer.js
+ - src/jqLite.js
+ - src/apis.js
+ - src/filters.js
+ - src/formatters.js
+ - src/validators.js
+ - src/service/cookieStore.js
+ - src/service/cookies.js
+ - src/service/defer.js
+ - src/service/document.js
+ - src/service/exceptionHandler.js
+ - src/service/hover.js
+ - src/service/invalidWidgets.js
+ - src/service/location.js
+ - src/service/log.js
+ - src/service/resource.js
+ - src/service/route.js
+ - src/service/updateView.js
+ - src/service/window.js
+ - src/service/xhr.bulk.js
+ - src/service/xhr.cache.js
+ - src/service/xhr.error.js
+ - src/service/xhr.js
+ - src/directives.js
+ - src/markups.js
+ - src/widgets.js
- example/personalLog/*.js
- test/testabilityPatch.js
- src/scenario/Scenario.js
diff --git a/jsTestDriver-jquery.conf b/jsTestDriver-jquery.conf
index 3926378f..4cf7a70c 100644
--- a/jsTestDriver-jquery.conf
+++ b/jsTestDriver-jquery.conf
@@ -7,8 +7,38 @@ load:
- test/jquery_alias.js
- src/Angular.js
- src/JSON.js
- - src/*.js
- - src/service/*.js
+ - src/Compiler.js
+ - src/Scope.js
+ - src/Injector.js
+ - src/parser.js
+ - src/Resource.js
+ - src/Browser.js
+ - src/sanitizer.js
+ - src/jqLite.js
+ - src/apis.js
+ - src/filters.js
+ - src/formatters.js
+ - src/validators.js
+ - src/service/cookieStore.js
+ - src/service/cookies.js
+ - src/service/defer.js
+ - src/service/document.js
+ - src/service/exceptionHandler.js
+ - src/service/hover.js
+ - src/service/invalidWidgets.js
+ - src/service/location.js
+ - src/service/log.js
+ - src/service/resource.js
+ - src/service/route.js
+ - src/service/updateView.js
+ - src/service/window.js
+ - src/service/xhr.bulk.js
+ - src/service/xhr.cache.js
+ - src/service/xhr.error.js
+ - src/service/xhr.js
+ - src/directives.js
+ - src/markups.js
+ - src/widgets.js
- example/personalLog/*.js
- test/testabilityPatch.js
- src/scenario/Scenario.js
diff --git a/jsTestDriver-perf.conf b/jsTestDriver-perf.conf
index bf400847..73b301c4 100644
--- a/jsTestDriver-perf.conf
+++ b/jsTestDriver-perf.conf
@@ -5,8 +5,38 @@ load:
- lib/jasmine-jstd-adapter/JasmineAdapter.js
- src/Angular.js
- src/JSON.js
- - src/*.js
- - src/service/*.js
+ - src/Compiler.js
+ - src/Scope.js
+ - src/Injector.js
+ - src/parser.js
+ - src/Resource.js
+ - src/Browser.js
+ - src/sanitizer.js
+ - src/jqLite.js
+ - src/apis.js
+ - src/filters.js
+ - src/formatters.js
+ - src/validators.js
+ - src/service/cookieStore.js
+ - src/service/cookies.js
+ - src/service/defer.js
+ - src/service/document.js
+ - src/service/exceptionHandler.js
+ - src/service/hover.js
+ - src/service/invalidWidgets.js
+ - src/service/location.js
+ - src/service/log.js
+ - src/service/resource.js
+ - src/service/route.js
+ - src/service/updateView.js
+ - src/service/window.js
+ - src/service/xhr.bulk.js
+ - src/service/xhr.cache.js
+ - src/service/xhr.error.js
+ - src/service/xhr.js
+ - src/directives.js
+ - src/markups.js
+ - src/widgets.js
- src/angular-mocks.js
- perf/data/*.js
- perf/testUtils.js
diff --git a/jsTestDriver.conf b/jsTestDriver.conf
index 901803b7..8e764269 100644
--- a/jsTestDriver.conf
+++ b/jsTestDriver.conf
@@ -7,8 +7,38 @@ load:
- test/jquery_remove.js
- src/Angular.js
- src/JSON.js
- - src/*.js
- - src/service/*.js
+ - src/Compiler.js
+ - src/Scope.js
+ - src/Injector.js
+ - src/parser.js
+ - src/Resource.js
+ - src/Browser.js
+ - src/sanitizer.js
+ - src/jqLite.js
+ - src/apis.js
+ - src/filters.js
+ - src/formatters.js
+ - src/validators.js
+ - src/service/cookieStore.js
+ - src/service/cookies.js
+ - src/service/defer.js
+ - src/service/document.js
+ - src/service/exceptionHandler.js
+ - src/service/hover.js
+ - src/service/invalidWidgets.js
+ - src/service/location.js
+ - src/service/log.js
+ - src/service/resource.js
+ - src/service/route.js
+ - src/service/updateView.js
+ - src/service/window.js
+ - src/service/xhr.bulk.js
+ - src/service/xhr.cache.js
+ - src/service/xhr.error.js
+ - src/service/xhr.js
+ - src/directives.js
+ - src/markups.js
+ - src/widgets.js
- example/personalLog/*.js
- test/testabilityPatch.js
- src/scenario/Scenario.js