Merge pull request #87 from JJK801/fix-lint

Fix spaces & semicolon for lint in tests

Author: kennydee

Gruntfile.js

@@ -99,7 +99,7 @@ module.exports = function (grunt) {
                 options: {
                     jshintrc: 'test/.jshintrc'
                 },
-                src: ['test/spec/{,*/}*.js']
+                src: ['test/spec/{,*/}*.js','test/e2e/{,*/}*.js']
             }
         },
 

bower.json

@@ -10,7 +10,7 @@
     "angular-route": "~1.2.0",
     "faye": "~1.0.0",
     "bootstrap": "~3.0.3",
-    "angular-gravatar": "~0.1.3",
+    "angular-gravatar": "0.1.3",
     "underscore": "~1.5.2",
     "restangular": "~1.3.1",
     "angular-ui-router": "~0.2.10",

package.json

@@ -45,7 +45,7 @@
     "jshint": "~2.3.0",
     "grunt-protractor-runner": "0.2.3",
     "phantomjs": "1.9.2-6",
-    "protractor": "~0.20.1",
+    "protractor": "~0.23.0",
     "chromedriver": "~2.8.1"
   },
   "engines": {

test/e2e/babitchGame.js

@@ -6,17 +6,17 @@ var page = null;
 
 describe('Babitch : Choose player', function() {
 
-	beforeEach(function() {
-		page = new BabitchGamePage(browser);
-	});
+    beforeEach(function() {
+        page = new BabitchGamePage(browser);
+    });
 
-	it('should not display startButton', function() {
-		expect(page.startButton.isDisplayed()).toBe(false);
-	});
+    it('should not display startButton', function() {
+        expect(page.startButton.isDisplayed()).toBe(false);
+    });
 
-	it('should have 4 selectable players', function() {
-		expect(page.playersLocation.count()).toBe(4);
-	});
+    it('should have 4 selectable players', function() {
+        expect(page.playersLocation.count()).toBe(4);
+    });
 
     it('should not display startButton without less than 4 selected players', function() {
         var playerLocation = page.getPlayerLocation(0);
@@ -29,174 +29,173 @@ describe('Babitch : Choose player', function() {
         var playerLocation1 = page.getPlayerLocation(0);
         playerLocation1.selectPlayer(0);
         expect(playerLocation1.getPlayerName()).toBe('Adrien');
+        
+        var playerLocation2 = page.getPlayerLocation(1);
+        playerLocation2.selectPlayer(1);
+        expect(playerLocation2.getPlayerName()).toBe('Antony');
+        
+        var playerLocation3 = page.getPlayerLocation(2);
+        playerLocation3.selectPlayer(2);
+        expect(playerLocation3.getPlayerName()).toBe('Aurelian');
+        
+        playerLocation3 = page.getPlayerLocation(3);
+        playerLocation3.selectPlayer(3);
+        expect(playerLocation3.getPlayerName()).toBe('Benjamin');
+        
+        expect(page.startButton.isDisplayed()).toBe(true);
+        
+        //Ugly $timeout e2e issue here :/
+        page.startButton.click();
+        
+        expect(page.score.isDisplayed()).toBe(true);
+        
+        // et de 0-0
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('0');
+    });
+});
 
-		var playerLocation2 = page.getPlayerLocation(1);
-		playerLocation2.selectPlayer(1);
-		expect(playerLocation2.getPlayerName()).toBe('Antony');
-
-		var playerLocation3 = page.getPlayerLocation(2);
-		playerLocation3.selectPlayer(2);
-		expect(playerLocation3.getPlayerName()).toBe('Aurelian');
-
-		var playerLocation3 = page.getPlayerLocation(3);
-		playerLocation3.selectPlayer(3);
-		expect(playerLocation3.getPlayerName()).toBe('Benjamin');
-
-
-  		expect(page.startButton.isDisplayed()).toBe(true);
+describe('Babitch : Game', function() {
+    beforeEach(function() {
+        page = new BabitchGamePage(browser);
 
-		//Ugly $timeout e2e issue here :/
-  		page.startButton.click();
+        //Choose 4 players
+        var playerLocation1 = page.getPlayerLocation(0);
+        playerLocation1.selectPlayer(0);
+        expect(playerLocation1.getPlayerName()).toBe('Adrien');
 
-  		expect(page.score.isDisplayed()).toBe(true);
+        var playerLocation2 = page.getPlayerLocation(1);
+        playerLocation2.selectPlayer(1);
+        expect(playerLocation2.getPlayerName()).toBe('Antony');
 
-  		// et de 0-0
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('0');
-	});
-});
+        var playerLocation3 = page.getPlayerLocation(2);
+        playerLocation3.selectPlayer(2);
+        expect(playerLocation3.getPlayerName()).toBe('Aurelian');
 
-describe('Babitch : Game', function() {
-	beforeEach(function() {
-		page = new BabitchGamePage(browser);
+        playerLocation3 = page.getPlayerLocation(3);
+        playerLocation3.selectPlayer(3);
+        expect(playerLocation3.getPlayerName()).toBe('Benjamin');
 
-		//Choose 4 players
-		var playerLocation1 = page.getPlayerLocation(0);
-		playerLocation1.selectPlayer(0);
-		expect(playerLocation1.getPlayerName()).toBe('Adrien');
+        //Begin a match
+        page.startButton.click();
 
-		var playerLocation2 = page.getPlayerLocation(1);
-		playerLocation2.selectPlayer(1);
-		expect(playerLocation2.getPlayerName()).toBe('Antony');
+        browser.waitForAngular();
+    }, 60000);
 
-		var playerLocation3 = page.getPlayerLocation(2);
-		playerLocation3.selectPlayer(2);
-		expect(playerLocation3.getPlayerName()).toBe('Aurelian');
+    //Defense goal
+    it('should add a goal for the blue team if the blue defender goal',function() {
+        var playerLocation = page.getPlayerLocation(3);
+        playerLocation.goal();
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('1');
+    });
 
-		var playerLocation3 = page.getPlayerLocation(3);
-		playerLocation3.selectPlayer(3);
-		expect(playerLocation3.getPlayerName()).toBe('Benjamin');
 
-		//Begin a match
-		page.startButton.click();
+    it('should add a goal for the red team if the red defender goal',function() {
+        var playerLocation = page.getPlayerLocation(0);
+        playerLocation.goal();
+        expect(page.firstTeamScore.getText()).toBe('1');
+        expect(page.secondTeamScore.getText()).toBe('0');
+    });
 
-		browser.waitForAngular();
-	}, 60000);
+    //Defense CSC
+    it('should add a goal for red team if the blue defender goal csc',function() {
+        var playerLocation = page.getPlayerLocation(3);
+        playerLocation.autogoal();
+        expect(page.firstTeamScore.getText()).toBe('1');
+        expect(page.secondTeamScore.getText()).toBe('0');
+    });
 
-	//Defense goal
-	it('should add a goal for the blue team if the blue defender goal',function() {
-		var playerLocation = page.getPlayerLocation(3);
-		playerLocation.goal();
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('1');
-	});
+    it('should add a goal for blue team if the red defender goal csc',function() {
+        var playerLocation = page.getPlayerLocation(1);
+        playerLocation.autogoal();
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('1');
+    });
 
+    //Attack Goal
+    it('should add a goal for the blue team if the blue attacker goal',function() {
+        var playerLocation = page.getPlayerLocation(2);
+        playerLocation.goal();
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('1');
+    });
 
-    it('should add a goal for the red team if the red defender goal',function() {
+    it('should add a goal for the red team if the red attacker goal',function() {
         var playerLocation = page.getPlayerLocation(0);
         playerLocation.goal();
         expect(page.firstTeamScore.getText()).toBe('1');
         expect(page.secondTeamScore.getText()).toBe('0');
     });
 
-	//Defense CSC
-	it('should add a goal for red team if the blue defender goal csc',function() {
-		var playerLocation = page.getPlayerLocation(3);
-		playerLocation.autogoal();
-  		expect(page.firstTeamScore.getText()).toBe('1');
-  		expect(page.secondTeamScore.getText()).toBe('0');
-	});
-
-	it('should add a goal for blue team if the red defender goal csc',function() {
-		var playerLocation = page.getPlayerLocation(1);
-		playerLocation.autogoal();
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('1');
-	});
-
-	//Attack Goal
-	it('should add a goal for the blue team if the blue attacker goal',function() {
-		var playerLocation = page.getPlayerLocation(2);
-		playerLocation.goal();
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('1');
-	});
-
-	it('should add a goal for the red team if the red attacker goal',function() {
-		var playerLocation = page.getPlayerLocation(0);
-		playerLocation.goal();
-  		expect(page.firstTeamScore.getText()).toBe('1');
-  		expect(page.secondTeamScore.getText()).toBe('0');
-	});
-
-	//Attack CSC
-	it('should add a goal for red team if the blue attacker goal csc',function() {
-		var playerLocation = page.getPlayerLocation(2);
-		playerLocation.autogoal();
-  		expect(page.firstTeamScore.getText()).toBe('1');
-  		expect(page.secondTeamScore.getText()).toBe('0');
-	});
-
-	it('should add a goal for blue team if the red attacker goal csc',function() {
-		var playerLocation = page.getPlayerLocation(1);
-		playerLocation.autogoal();
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('1');
-	});
-
-	//Cancel a Goal
-	it('should cancel last goal',function() {
-		var cancelLastGoalButton = page.getCancelLastGoalButton(),
-			optionButtion = page.getOptionButton();
-
-		expect(cancelLastGoalButton.isDisplayed()).toBe(false);
-
-		var playerLocation = page.getPlayerLocation(3);
-		playerLocation.goal();
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('1');
-
-  		optionButtion.click().then(function() {
-  			browser.waitForAngular();
-  		}).then(function () {
-  			//Cancel the goal
-			expect(cancelLastGoalButton.isDisplayed()).toBe(true);
-			cancelLastGoalButton.click();
-
-	  		//The button must be hidden
-	  		expect(page.firstTeamScore.getText()).toBe('0');
-	  		expect(page.secondTeamScore.getText()).toBe('0');
-	  		expect(cancelLastGoalButton.isDisplayed()).toBe(false);
-  		});
-	});
-
-	it('should propose to restart or to make a new game',function() {
-		expect(page.theEnd.isDisplayed()).toBe(false);
-		var playerLocation = page.getPlayerLocation(2);
-		for(var i=0; i<10 ; i++) {
-			playerLocation.goal();
-		}
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('10');
-  		expect(page.theEnd.isDisplayed()).toBe(true);
-	}, 60000);
-
-	it('should start a new game',function() {
-		var playerLocation = page.getPlayerLocation(2);
-  		expect(page.score.isDisplayed()).toBe(true);
-		for(var i=0; i<10 ; i++) {
-			playerLocation.goal();
-		}
-  		expect(page.firstTeamScore.getText()).toBe('0');
-  		expect(page.secondTeamScore.getText()).toBe('10');
-  		expect(page.theEnd.isDisplayed()).toBe(true);
-  		page.theEndNewGame.click();
-  		expect(page.score.isDisplayed()).toBe(false);
-
-  		//Select adrien again
-  		var playerLocation1 = page.getPlayerLocation(0);
-		playerLocation1.selectPlayer(0);
-		expect(playerLocation1.getPlayerName()).toBe('Adrien');
-	}, 60000);
+    //Attack CSC
+    it('should add a goal for red team if the blue attacker goal csc',function() {
+        var playerLocation = page.getPlayerLocation(2);
+        playerLocation.autogoal();
+        expect(page.firstTeamScore.getText()).toBe('1');
+        expect(page.secondTeamScore.getText()).toBe('0');
+    });
+
+    it('should add a goal for blue team if the red attacker goal csc',function() {
+        var playerLocation = page.getPlayerLocation(1);
+        playerLocation.autogoal();
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('1');
+    });
+
+    //Cancel a Goal
+    it('should cancel last goal',function() {
+        var cancelLastGoalButton = page.getCancelLastGoalButton(),
+            optionButtion = page.getOptionButton();
+        
+        expect(cancelLastGoalButton.isDisplayed()).toBe(false);
+        
+        var playerLocation = page.getPlayerLocation(3);
+        playerLocation.goal();
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('1');
+        
+        optionButtion.click().then(function() {
+            browser.waitForAngular();
+        }).then(function () {
+            //Cancel the goal
+            expect(cancelLastGoalButton.isDisplayed()).toBe(true);
+            cancelLastGoalButton.click();
+        
+            //The button must be hidden
+            expect(page.firstTeamScore.getText()).toBe('0');
+            expect(page.secondTeamScore.getText()).toBe('0');
+            expect(cancelLastGoalButton.isDisplayed()).toBe(false);
+        });
+    });
+
+    it('should propose to restart or to make a new game',function() {
+        expect(page.theEnd.isDisplayed()).toBe(false);
+        var playerLocation = page.getPlayerLocation(2);
+        for(var i=0; i<10 ; i++) {
+            playerLocation.goal();
+        }
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('10');
+        expect(page.theEnd.isDisplayed()).toBe(true);
+    }, 60000);
+
+    it('should start a new game',function() {
+        var playerLocation = page.getPlayerLocation(2);
+        expect(page.score.isDisplayed()).toBe(true);
+        for(var i=0; i<10 ; i++) {
+            playerLocation.goal();
+        }
+        expect(page.firstTeamScore.getText()).toBe('0');
+        expect(page.secondTeamScore.getText()).toBe('10');
+        expect(page.theEnd.isDisplayed()).toBe(true);
+        page.theEndNewGame.click();
+        expect(page.score.isDisplayed()).toBe(false);
+        
+        //Select adrien again
+        var playerLocation1 = page.getPlayerLocation(0);
+        playerLocation1.selectPlayer(0);
+        expect(playerLocation1.getPlayerName()).toBe('Adrien');
+    }, 60000);
 
 });