From 25a77c58c13e4df37c29245bec0f7716e20f3c15 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 1 Jul 2011 17:34:12 -0700 Subject: 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. --- jsTestDriver.conf | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'jsTestDriver.conf') 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 -- cgit v1.2.3