invisi/angular.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

refactor(test/e2e): restore consistency across tests (just because)

Browse Source
This commit is contained in:
Georgios Kalpakas
2016-07-15 15:21:05 +03:00
committed by Peter Bacon Darwin
parent 26dac5784a
commit fa81df4779
14 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/fixtures/angular-already-loaded/index.html
+8 -6
View File
@@ -1,10 +1,12 @@
<!DOCTYPE html>
<html ng-app="test">
<div ng-controller="TestCtrl">
<p>{{text}}</p>
</div>
<body>
<div ng-controller="TestController">
<p>{{text}}</p>
</div>
<script src="angular.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
<script src="angular.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
</body>
</html>
test/e2e/fixtures/angular-already-loaded/script.js
Vendored
+4 -3
View File
@@ -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!';
});
test/e2e/fixtures/loader/index.html
+19 -16
View File
@@ -1,20 +1,23 @@
<!DOCTYPE html>
<html ng-app="test">
<div ng-controller="TestCtrl">
<p>{{text}}</p>
</div>
<body>
<div ng-controller="TestController">
<p>{{text}}</p>
</div>
<script src="angular-loader.js"></script>
<script src="angular-touch.js"></script>
<script src="angular-sanitize.js"></script>
<script src="angular-route.js"></script>
<script src="angular-resource.js"></script>
<script src="angular-parse-ext.js"></script>
<script src="angular-messages.js"></script>
<script src="angular-message-format.js"></script>
<script src="angular-cookies.js"></script>
<script src="angular-aria.js"></script>
<script src="angular-animate.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
<!-- Load modules before `angular.js` -->
<script src="angular-loader.js"></script>
<script src="angular-touch.js"></script>
<script src="angular-sanitize.js"></script>
<script src="angular-route.js"></script>
<script src="angular-resource.js"></script>
<script src="angular-parse-ext.js"></script>
<script src="angular-messages.js"></script>
<script src="angular-message-format.js"></script>
<script src="angular-cookies.js"></script>
<script src="angular-aria.js"></script>
<script src="angular-animate.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
</body>
</html>
test/e2e/fixtures/loader/script.js
+1 -1
View File
@@ -11,6 +11,6 @@ angular.
'ngAria',
'ngAnimate'
]).
controller('TestCtrl', function TestCtrl($scope) {
controller('TestController', function($scope) {
$scope.text = 'Hello, world!';
});
test/e2e/fixtures/ngJq/index.html
+1 -1
View File
@@ -10,6 +10,6 @@
window[''] = window.jQuery;
</script>
<script src="angular.js"></script>
<script type="text/javascript" src="script.js"></script>
<script src="script.js"></script>
</body>
</html>
test/e2e/fixtures/ngJq/script.js
+3 -2
View File
@@ -1,4 +1,5 @@
angular.module('test', [])
.run(function($rootScope) {
angular.
module('test', []).
run(function($rootScope) {
$rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
});
test/e2e/fixtures/ngJqJquery/index.html
+9 -9
View File
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html ng-app="test" ng-jq="jQuery_2_1_0">
<body>
{{jqueryVersion}}
{{jqueryVersion}}
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
<script>
var jQuery_2_1_0 = jQuery.noConflict();
</script>
<script src="../../../../bower_components/jquery/dist/jquery.js"></script>
<script src="angular.js"></script>
<script type="text/javascript" src="script.js"></script>
</body>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
<script>
var jQuery_2_1_0 = jQuery.noConflict();
</script>
<script src="../../../../bower_components/jquery/dist/jquery.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
</body>
</html>
test/e2e/fixtures/ngJqJquery/script.js
+3 -2
View File
@@ -1,4 +1,5 @@
angular.module('test', [])
.run(function($rootScope) {
angular.
module('test', []).
run(function($rootScope) {
$rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
});
test/e2e/fixtures/sample/index.html
+7 -5
View File
@@ -1,9 +1,11 @@
<!DOCTYPE html>
<html ng-app="test">
<div ng-controller="TestCtrl">
<p>{{text}}</p>
</div>
<body>
<div ng-controller="TestController">
<p>{{text}}</p>
</div>
<script src="angular.js"></script>
<script src="script.js"></script>
<script src="angular.js"></script>
<script src="script.js"></script>
</body>
</html>
test/e2e/fixtures/sample/script.js
+4 -3
View File
@@ -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!';
});
test/e2e/tests/angular-already-loadedSpec.js
Vendored
+2 -3
View File
@@ -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').andWaitForAngular();
});
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!');
});
});
test/e2e/tests/loaderSpec.js
+2 -2
View File
@@ -1,6 +1,6 @@
describe('loader', function() {
describe('angular-loader', function() {
beforeEach(function() {
loadFixture("loader").andWaitForAngular();
loadFixture('loader').andWaitForAngular();
});
it('should not be broken by loading the modules before core', function() {
test/e2e/tests/ngJqSpec.js
+4 -5
View File
@@ -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').andWaitForAngular();
expect(element(by.binding('jqueryVersion')).getText()).toBe('jqLite');
});
it('should be able to use a specific version jQuery', function() {
loadFixture("ngJqJquery").andWaitForAngular();
loadFixture('ngJqJquery').andWaitForAngular();
expect(element(by.binding('jqueryVersion')).getText()).toBe('2.1.0');
});
});
test/e2e/tests/sampleSpec.js
+2 -4
View File
@@ -1,12 +1,10 @@
// Sample E2E test:
//
describe('Sample', function() {
beforeEach(function() {
loadFixture("sample").andWaitForAngular();
loadFixture('sample').andWaitForAngular();
});
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!');
});
});