diff --git a/javascript/angular/exercices/protractor/app/app.js b/javascript/angular/exercices/protractor/app/app.js deleted file mode 100644 index 48acae9..0000000 --- a/javascript/angular/exercices/protractor/app/app.js +++ /dev/null @@ -1,12 +0,0 @@ -var myApp = angular.module('myApp', []); - -myApp.controller('ExoCtrl', ['$scope', function($scope) { - - $scope.val1 = 1; - $scope.val2 = 2; - - $scope.add = function() { - $scope.result = $scope.val1 + $scope.val2; - }; - -}]); diff --git a/javascript/angular/exercices/protractor/conf.js b/javascript/angular/exercices/protractor/conf.js new file mode 100644 index 0000000..6f324cd --- /dev/null +++ b/javascript/angular/exercices/protractor/conf.js @@ -0,0 +1,4 @@ +exports.config = { + seleniumAddress: 'http://localhost:4444/wd/hub', + specs: ['test/todomvc-spec.js'] +}; diff --git a/javascript/angular/exercices/protractor/package.json b/javascript/angular/exercices/protractor/package.json new file mode 100644 index 0000000..f96b3b9 --- /dev/null +++ b/javascript/angular/exercices/protractor/package.json @@ -0,0 +1,14 @@ +{ + "name": "protractor-exo", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "protractor": "^2.0.0" + } +} diff --git a/javascript/angular/exercices/protractor/test/todomvc-spec.js b/javascript/angular/exercices/protractor/test/todomvc-spec.js new file mode 100644 index 0000000..fd5afa8 --- /dev/null +++ b/javascript/angular/exercices/protractor/test/todomvc-spec.js @@ -0,0 +1,13 @@ +describe('TodoMVC spec', function() { + + it('should navigate to TodoMVC/Angular', function() { + + // Documentation API: http://angular.github.io/protractor/#/api + + browser.get('http://todomvc.com/examples/angularjs/'); + + expect(browser.getCurrentUrl()).toBe('http://todomvc.com/examples/angularjs/#/'); + + }); + +}); diff --git a/javascript/angular/img/jasmine-horizontal.svg b/javascript/angular/img/jasmine-horizontal.svg new file mode 100644 index 0000000..ba8990e --- /dev/null +++ b/javascript/angular/img/jasmine-horizontal.svg @@ -0,0 +1,102 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/javascript/angular/img/protractor-logo-450.png b/javascript/angular/img/protractor-logo-450.png new file mode 100644 index 0000000..16b9bf8 Binary files /dev/null and b/javascript/angular/img/protractor-logo-450.png differ diff --git a/javascript/angular/index.html b/javascript/angular/index.html index 655d31d..5cc77c3 100644 --- a/javascript/angular/index.html +++ b/javascript/angular/index.html @@ -42,6 +42,7 @@ 'projet-outils-2', 'projet-outils-3', 'projet-outils-4', + 'projet-outils-5', 'questions', 'licence' ]; diff --git a/javascript/angular/plan.md b/javascript/angular/plan.md index 666872c..83d755f 100644 --- a/javascript/angular/plan.md +++ b/javascript/angular/plan.md @@ -36,11 +36,11 @@ - Les filtres (exercice filtres-1) - Création de directives - Utilisation de modules - - Routage avec module ngRoute + - Routage avec module ngRoute (exercice routage) - API REST & ngResource - Menée de projet et outils - Structuration d'un projet - - Batarang + - ng-inspector - Tests unitaires - Tests fonctionnels - Mise en pratique diff --git a/javascript/angular/projet-outils-1.md b/javascript/angular/projet-outils-1.md index fdcdec3..d73f437 100644 --- a/javascript/angular/projet-outils-1.md +++ b/javascript/angular/projet-outils-1.md @@ -1,4 +1,4 @@ -# .cadoles-slide-title[Menée de projet & outils (1/)] +# .cadoles-slide-title[Menée de projet & outils (1/5)] **Organisation d'un petit projet** ```text diff --git a/javascript/angular/projet-outils-2.md b/javascript/angular/projet-outils-2.md index aa674bc..2a04ba3 100644 --- a/javascript/angular/projet-outils-2.md +++ b/javascript/angular/projet-outils-2.md @@ -1,4 +1,4 @@ -# .cadoles-slide-title[Menée de projet & outils (2/)] +# .cadoles-slide-title[Menée de projet & outils (2/5)] **Organisation d'un projet plus important** ```text diff --git a/javascript/angular/projet-outils-3.md b/javascript/angular/projet-outils-3.md index e854587..41146dd 100644 --- a/javascript/angular/projet-outils-3.md +++ b/javascript/angular/projet-outils-3.md @@ -1,4 +1,4 @@ -# .cadoles-slide-title[Menée de projet & outils (3/)] +# .cadoles-slide-title[Menée de projet & outils (3/5)] **Extension Chromium: ng-inspector** diff --git a/javascript/angular/projet-outils-4.md b/javascript/angular/projet-outils-4.md index a057501..078b882 100644 --- a/javascript/angular/projet-outils-4.md +++ b/javascript/angular/projet-outils-4.md @@ -1,7 +1,13 @@ -# .cadoles-slide-title[Menée de projet & outils (4/)] +# .cadoles-slide-title[Menée de projet & outils (4/5)] **Tests unitaires avec Karma & Jasmine** -.cadoles-center[ +- [Jasmine](https://jasmine.github.io/), librairie de tests unitaires +- [Karma](https://karma-runner.github.io), dérouleur de tests unitaire, basé sur la technologie Webdriver. + +.cadoles-left-column[ ] +.cadoles-right-column[ + +] diff --git a/javascript/angular/projet-outils-5.md b/javascript/angular/projet-outils-5.md new file mode 100644 index 0000000..3bb1d8e --- /dev/null +++ b/javascript/angular/projet-outils-5.md @@ -0,0 +1,9 @@ +# .cadoles-slide-title[Menée de projet & outils (5/5)] + +**Tests fonctionnels avec Protractor** + +- [Protractor](http://angular.github.io/protractor/), dérouleur de tests fonctionnels + +.cadoles-center[ + +]