From 3b4bfa177103986653fabf5a02b20cf97781830a Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@gmail.com>
Date: Mon, 6 Jun 2016 17:03:59 +0200
Subject: [PATCH] refactor(ngMock): extract browserTrigger from ngScenario

`ngScenario` is deprecated, and we expect to remove it from the project in 1.6,
but we use the `browserTrigger` helper throughout our unit tests.

So in preparation for removing `ngScenario` we are relocating `browserTrigger`
to the `ngMock` folder.

Although many people are using browserTrigger in their own application testing
we are still not yet ready to make this a public API; so developers use
this helper at their own risk.

Closes #14718

BREAKING CHANGE

Although it is not a public API, many developers are using `browserTrigger`
in their own application testing. We have now moved this helper from
`ngScenario/browserTrigger.js` to `ngMock/browserTrigger.js`.
---
 angularFiles.js                              | 5 ++---
 src/ngMock/.jshintrc                         | 7 ++++++-
 src/{ngScenario => ngMock}/browserTrigger.js | 0
 src/ngScenario/.jshintrc                     | 4 ----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{ngScenario => ngMock}/browserTrigger.js (100%)

diff --git a/angularFiles.js b/angularFiles.js
index 35f302cee..cbc98db0b 100755
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -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',
@@ -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',
@@ -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',
diff --git a/src/ngMock/.jshintrc b/src/ngMock/.jshintrc
index 78bca4c94..ca9fcdd54 100644
--- a/src/ngMock/.jshintrc
+++ b/src/ngMock/.jshintrc
@@ -5,6 +5,11 @@
 
     "angular": false,
     "expect": false,
-    "jQuery": false
+    "jQuery": false,
+
+    "AnimationEvent": false,
+    "TransitionEvent": false,
+    "WebKitAnimationEvent": false,
+    "WebKitTransitionEvent": false
   }
 }
diff --git a/src/ngScenario/browserTrigger.js b/src/ngMock/browserTrigger.js
similarity index 100%
rename from src/ngScenario/browserTrigger.js
rename to src/ngMock/browserTrigger.js
diff --git a/src/ngScenario/.jshintrc b/src/ngScenario/.jshintrc
index a348bb0c7..ab7250a69 100644
--- a/src/ngScenario/.jshintrc
+++ b/src/ngScenario/.jshintrc
@@ -13,10 +13,6 @@
     "_jQuery": false,
     "angularInit": false,
     "formatException": false,
-    "AnimationEvent": false,
-    "TransitionEvent": false,
-    "WebKitAnimationEvent": false,
-    "WebKitTransitionEvent": false,
     "$runner": false,
     "callerFile": false
   }