Revisited bootstrapping method

tnajdek · tnajdek · commit a9e74c96985c · 2013-11-21T23:48:42.000Z
* Now uses documented 'NG_DEFER_BOOTSTRAP!' feature so should be more stable * All e2e tests are now passing as expected * Updated Angular dependency to 1.2.1 * Resolves #25
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This is a fork of [Angular Seed](https://github.com/angular/angular-seed) but with changes needed for requireJS support.
 
-* AngularJS 1.2.0
+* AngularJS 1.2.1
 * RequireJS 2.1.9
 * Full support for unit and e2e tests
 * Support for Karma Test Runner 0.10+ (formerly Testacular)
diff --git a/app/js/main.js b/app/js/main.js
@@ -19,6 +19,9 @@ require.config({
 	]
 });
 
+//http://code.angularjs.org/1.2.1/docs/guide/bootstrap#overview_deferred-bootstrap
+window.name = "NG_DEFER_BOOTSTRAP!";
+
 require( [
 	'angular',
 	'app',
@@ -28,7 +31,6 @@ require( [
 	var $html = angular.element(document.getElementsByTagName('html')[0]);
 
 	angular.element().ready(function() {
-		$html.addClass('ng-app');
-		angular.bootstrap($html, [app['name']]);
+		angular.resumeBootstrap([app['name']]);
 	});
 });
diff --git a/bower.json b/bower.json
@@ -9,10 +9,10 @@
     "tests"
   ],
   "devDependencies": {
-    "angular": "~1.2.0",
-    "angular-scenario": "~1.2.0",
-    "angular-route": "~1.2.0",
-    "angular-mocks": "~1.2.0",
+    "angular": "~1.2.1",
+    "angular-scenario": "~1.2.1",
+    "angular-route": "~1.2.1",
+    "angular-mocks": "~1.2.1",
     "requirejs": "~2.1.9",
     "requirejs-text": "~2.0.10"
   }
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" ng-app>
 	<head>
 		<title>Angular-RequireJS sample app</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/test/e2e/scenario.js b/test/e2e/scenario.js
@@ -6,7 +6,7 @@
 describe('My Application', function() {
 	beforeEach(function() {
 		browser().navigateTo('/');
-		sleep(0.5);
+		sleep(1);
 	});
 
 
@@ -17,7 +17,7 @@ describe('My Application', function() {
 	describe('View 1', function() {
 		beforeEach(function() {
 			browser().navigateTo('#/view1');
-			sleep(0.5);
+			sleep(1);
 		});
 
 		it('should...', function() {
