diff --git a/test/e2e/fixtures/angular-already-loaded/index.html b/test/e2e/fixtures/angular-already-loaded/index.html index 292124d4fe1b..b001636dabd8 100644 --- a/test/e2e/fixtures/angular-already-loaded/index.html +++ b/test/e2e/fixtures/angular-already-loaded/index.html @@ -1,10 +1,12 @@ -
-

{{text}}

-
+ +
+

{{text}}

+
- - - + + + + diff --git a/test/e2e/fixtures/angular-already-loaded/script.js b/test/e2e/fixtures/angular-already-loaded/script.js index 2d625bb4f19c..f731efe3e2c9 100644 --- a/test/e2e/fixtures/angular-already-loaded/script.js +++ b/test/e2e/fixtures/angular-already-loaded/script.js @@ -1,4 +1,5 @@ -angular.module("test", []). - controller("TestCtrl", function($scope) { - $scope.text = "Hello, world!"; +angular. + module('test', []). + controller('TestController', function($scope) { + $scope.text = 'Hello, world!'; }); diff --git a/test/e2e/fixtures/loader/index.html b/test/e2e/fixtures/loader/index.html index 3df9ae87a5d4..a7f97b42cfca 100644 --- a/test/e2e/fixtures/loader/index.html +++ b/test/e2e/fixtures/loader/index.html @@ -1,20 +1,23 @@ -
-

{{text}}

-
+ +
+

{{text}}

+
- - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/test/e2e/fixtures/loader/script.js b/test/e2e/fixtures/loader/script.js index 9dd6ec9919a7..3ea83bae30a5 100644 --- a/test/e2e/fixtures/loader/script.js +++ b/test/e2e/fixtures/loader/script.js @@ -11,6 +11,6 @@ angular. 'ngAria', 'ngAnimate' ]). - controller('TestCtrl', function TestCtrl($scope) { + controller('TestController', function($scope) { $scope.text = 'Hello, world!'; }); diff --git a/test/e2e/fixtures/ngJq/index.html b/test/e2e/fixtures/ngJq/index.html index af91514ac1e5..7d035a26225d 100644 --- a/test/e2e/fixtures/ngJq/index.html +++ b/test/e2e/fixtures/ngJq/index.html @@ -10,6 +10,6 @@ window[''] = window.jQuery; - + diff --git a/test/e2e/fixtures/ngJq/script.js b/test/e2e/fixtures/ngJq/script.js index f91e1ea9cd3b..89fc6b873250 100644 --- a/test/e2e/fixtures/ngJq/script.js +++ b/test/e2e/fixtures/ngJq/script.js @@ -1,4 +1,5 @@ -angular.module('test', []) - .run(function($rootScope) { +angular. + module('test', []). + run(function($rootScope) { $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite'; }); diff --git a/test/e2e/fixtures/ngJqJquery/index.html b/test/e2e/fixtures/ngJqJquery/index.html index d648e16df870..d98f4ca96f0f 100644 --- a/test/e2e/fixtures/ngJqJquery/index.html +++ b/test/e2e/fixtures/ngJqJquery/index.html @@ -1,14 +1,14 @@ - {{jqueryVersion}} + {{jqueryVersion}} - - - - - - + + + + + + diff --git a/test/e2e/fixtures/ngJqJquery/script.js b/test/e2e/fixtures/ngJqJquery/script.js index f91e1ea9cd3b..89fc6b873250 100644 --- a/test/e2e/fixtures/ngJqJquery/script.js +++ b/test/e2e/fixtures/ngJqJquery/script.js @@ -1,4 +1,5 @@ -angular.module('test', []) - .run(function($rootScope) { +angular. + module('test', []). + run(function($rootScope) { $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite'; }); diff --git a/test/e2e/fixtures/sample/index.html b/test/e2e/fixtures/sample/index.html index 45e8747fa931..8a1551be0b19 100644 --- a/test/e2e/fixtures/sample/index.html +++ b/test/e2e/fixtures/sample/index.html @@ -1,9 +1,11 @@ -
-

{{text}}

-
+ +
+

{{text}}

+
- - + + + diff --git a/test/e2e/fixtures/sample/script.js b/test/e2e/fixtures/sample/script.js index 2d625bb4f19c..f731efe3e2c9 100644 --- a/test/e2e/fixtures/sample/script.js +++ b/test/e2e/fixtures/sample/script.js @@ -1,4 +1,5 @@ -angular.module("test", []). - controller("TestCtrl", function($scope) { - $scope.text = "Hello, world!"; +angular. + module('test', []). + controller('TestController', function($scope) { + $scope.text = 'Hello, world!'; }); diff --git a/test/e2e/tests/angular-already-loadedSpec.js b/test/e2e/tests/angular-already-loadedSpec.js index 87e4d8aabe14..4b304d86cedc 100644 --- a/test/e2e/tests/angular-already-loadedSpec.js +++ b/test/e2e/tests/angular-already-loadedSpec.js @@ -1,10 +1,9 @@ describe('App where angular is loaded more than once', function() { beforeEach(function() { - loadFixture("angular-already-loaded").andWaitForAngular(); + loadFixture('angular-already-loaded'); }); it('should have the interpolated text', function() { - expect(element(by.binding('text')).getText()) - .toBe('Hello, world!'); + expect(element(by.binding('text')).getText()).toBe('Hello, world!'); }); }); diff --git a/test/e2e/tests/helpers/main.js b/test/e2e/tests/helpers/main.js index 116271f9136f..5459ffc2d836 100644 --- a/test/e2e/tests/helpers/main.js +++ b/test/e2e/tests/helpers/main.js @@ -1,7 +1,4 @@ var helper = { - andWaitForAngular: function() { - browser.waitForAngular(); - }, loadFixture: function(fixture) { var i = 0; while (fixture[i] === '/') ++i; diff --git a/test/e2e/tests/loaderSpec.js b/test/e2e/tests/loaderSpec.js index bf63b5f064bd..f75d49b5bbf3 100644 --- a/test/e2e/tests/loaderSpec.js +++ b/test/e2e/tests/loaderSpec.js @@ -1,6 +1,6 @@ -describe('loader', function() { +describe('angular-loader', function() { beforeEach(function() { - loadFixture("loader").andWaitForAngular(); + loadFixture('loader'); }); it('should not be broken by loading the modules before core', function() { diff --git a/test/e2e/tests/ngJqSpec.js b/test/e2e/tests/ngJqSpec.js index fd9ea368fc0d..bfe30788c21f 100644 --- a/test/e2e/tests/ngJqSpec.js +++ b/test/e2e/tests/ngJqSpec.js @@ -1,12 +1,11 @@ -describe('Customizing the jqlite / jquery version', function() { - - it('should be able to force jqlite', function() { - loadFixture("ngJq").andWaitForAngular(); +describe('Customizing the jqLite / jQuery version', function() { + it('should be able to force jqLite', function() { + loadFixture('ngJq'); expect(element(by.binding('jqueryVersion')).getText()).toBe('jqLite'); }); it('should be able to use a specific version jQuery', function() { - loadFixture("ngJqJquery").andWaitForAngular(); + loadFixture('ngJqJquery'); expect(element(by.binding('jqueryVersion')).getText()).toBe('2.1.0'); }); }); diff --git a/test/e2e/tests/sampleSpec.js b/test/e2e/tests/sampleSpec.js index 07cdec659e7e..e46a936d28b7 100644 --- a/test/e2e/tests/sampleSpec.js +++ b/test/e2e/tests/sampleSpec.js @@ -1,12 +1,10 @@ // Sample E2E test: -// describe('Sample', function() { beforeEach(function() { - loadFixture("sample").andWaitForAngular(); + loadFixture('sample'); }); it('should have the interpolated text', function() { - expect(element(by.binding('text')).getText()) - .toBe('Hello, world!'); + expect(element(by.binding('text')).getText()).toBe('Hello, world!'); }); });