Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

refactor(ngMock): extract browserTrigger from ngScenario #14718

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions angularFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ var angularFiles = {
'src/ngSanitize/filter/linky.js'
],
'ngMock': [
'src/ngMock/angular-mocks.js'
'src/ngMock/angular-mocks.js',
'src/ngMock/browserTrigger.js'
],
'ngTouch': [
'src/ngTouch/touch.js',
Expand All @@ -152,7 +153,6 @@ var angularFiles = {

'angularScenario': [
'src/ngScenario/Scenario.js',
'src/ngScenario/browserTrigger.js',
'src/ngScenario/Application.js',
'src/ngScenario/Describe.js',
'src/ngScenario/Future.js',
Expand Down Expand Up @@ -211,7 +211,6 @@ var angularFiles = {
'build/angular.js',
'@angularSrcModules',
'test/modules/no_bootstrap.js',
'src/ngScenario/browserTrigger.js',
'test/helpers/*.js',
'test/ngAnimate/*.js',
'test/ngMessageFormat/*.js',
Expand Down
7 changes: 6 additions & 1 deletion src/ngMock/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

"angular": false,
"expect": false,
"jQuery": false
"jQuery": false,

"AnimationEvent": false,
"TransitionEvent": false,
"WebKitAnimationEvent": false,
"WebKitTransitionEvent": false
}
}
4 changes: 0 additions & 4 deletions src/ngScenario/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
"_jQuery": false,
"angularInit": false,
"formatException": false,
"AnimationEvent": false,
"TransitionEvent": false,
"WebKitAnimationEvent": false,
"WebKitTransitionEvent": false,
"$runner": false,
"callerFile": false
}
Expand Down