aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBraden Shepherdson2013-07-23 10:42:34 -0700
committerPete Bacon Darwin2013-07-23 20:33:01 +0100
commitdfa83475a5c8d5156b09a009b690e8677fb97e0a (patch)
tree3503608d77e9fa50571048dffe8d96154d0ceb5d
parent6476aed7626fa7b4adefa99c5cb4a86ed371835c (diff)
downloadangular.js-dfa83475a5c8d5156b09a009b690e8677fb97e0a.tar.bz2
docs(bootstrap): Note that ngScenario requires ngApp
ngScenario expects an ngApp directive to be used, and doesn't work for manually bootstrapped apps. The failure mode is to hang on navigation. Trying to make this wont-fix bug less obscure by documenting it. Eventually Protractor will replace ngScenario and fix this.
-rw-r--r--docs/content/guide/dev_guide.e2e-testing.ngdoc4
-rw-r--r--src/Angular.js3
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/content/guide/dev_guide.e2e-testing.ngdoc b/docs/content/guide/dev_guide.e2e-testing.ngdoc
index 243517ad..00339cb4 100644
--- a/docs/content/guide/dev_guide.e2e-testing.ngdoc
+++ b/docs/content/guide/dev_guide.e2e-testing.ngdoc
@@ -302,3 +302,7 @@ element('.btn-danger').click();
element('table tbody a');
element('.btn-danger').click();
</pre>
+
+# Caveats
+
+ngScenario does not work with apps that manually bootstrap using angular.bootstrap. You must use the ng-app directive.
diff --git a/src/Angular.js b/src/Angular.js
index 02dadf8d..a41ef4e8 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1036,6 +1036,9 @@ function angularInit(element, bootstrap) {
*
* See: {@link guide/bootstrap Bootstrap}
*
+ * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually.
+ * They must use {@link api/ng.directive:ngApp ngApp}.
+ *
* @param {Element} element DOM element which is the root of angular application.
* @param {Array<String|Function>=} modules an array of module declarations. See: {@link angular.module modules}
* @returns {AUTO.$injector} Returns the newly created injector for this app.