diff options
| author | Igor Minar | 2013-04-18 12:50:49 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-04-18 14:34:53 -0700 |
| commit | 5da6b125a7447b4bbabb88b2d82b5634b55c3aea (patch) | |
| tree | d67bb5ce97dbed432b15ed9481f5055416437604 /angularFiles.js | |
| parent | 695c54c17b3299cd6170c45878b41cb46a577cd2 (diff) | |
| download | angular.js-5da6b125a7447b4bbabb88b2d82b5634b55c3aea.tar.bz2 | |
test(modules): fix module tests which got disabled by ngMobile
When ngMobile was merged in, we accidentaly included angular-scenario.js
in the test file set for modules. Loading this file overrode jasmine's
`it` and `describe` global functions which essentially disabled all of
~200 unit tests for wrapped modules.
This change refactors the code to run the wrapped module tests.
I had to extract browserTrigger from scenario runner in order to achieve
this without code duplication.
Diffstat (limited to 'angularFiles.js')
| -rw-r--r-- | angularFiles.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/angularFiles.js b/angularFiles.js index b2c23a8f..30c65df1 100644 --- a/angularFiles.js +++ b/angularFiles.js @@ -80,6 +80,7 @@ angularFiles = { 'angularScenario': [ 'src/ngScenario/Scenario.js', + 'src/ngScenario/browserTrigger.js', 'src/ngScenario/Application.js', 'src/ngScenario/Describe.js', 'src/ngScenario/Future.js', @@ -147,7 +148,6 @@ angularFiles = { 'lib/jasmine/jasmine.js', 'lib/jasmine-jstd-adapter/JasmineAdapter.js', 'build/angular.js', - 'build/angular-scenario.js', 'src/ngMock/angular-mocks.js', 'src/ngCookies/cookies.js', 'src/ngResource/resource.js', @@ -157,7 +157,9 @@ angularFiles = { 'src/ngSanitize/sanitize.js', 'src/ngSanitize/directive/ngBindHtml.js', 'src/ngSanitize/filter/linky.js', + 'src/ngScenario/browserTrigger.js', 'test/matchers.js', + 'test/testabilityPatch.js', 'test/ngMock/*.js', 'test/ngCookies/*.js', 'test/ngResource/*.js', |