mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-23 18:00:26 +00:00
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.
This commit is contained in:
parent
75721223b5
commit
25a77c58c1
4 changed files with 128 additions and 8 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue