Updates from Kato's code review

jwngr · jwngr · commit ae28f997a118 · 2015-03-03T15:00:43.000-08:00
diff --git a/tests/protractor/chat/chat.html b/tests/protractor/chat/chat.html
@@ -17,7 +17,7 @@
   </head>
 
   <body ng-controller="ChatCtrl">
-    <!-- Firebase push ID where data is stored -->
+    <!-- Firebase push ID where data is stored (used by the test spec to know where data is stored) -->
     <p id="pushId"></p>
 
     <!-- Clear Firebase button -->
diff --git a/tests/protractor/chat/chat.spec.js b/tests/protractor/chat/chat.spec.js
@@ -37,10 +37,10 @@ describe('Chat App', function () {
 
   beforeEach(function (done) {
     if (!isPageLoaded) {
+      isPageLoaded = true;
+
       // Navigate to the chat app
       browser.get('chat/chat.html').then(function() {
-        isPageLoaded = true;
-
         // Get the random push ID where the data is being stored
         return $('#pushId').getText();
       }).then(function(pushId) {
diff --git a/tests/protractor/priority/priority.html b/tests/protractor/priority/priority.html
@@ -17,7 +17,7 @@
   </head>
 
   <body ng-controller="PriorityCtrl">
-    <!-- Firebase push ID where data is stored -->
+    <!-- Firebase push ID where data is stored (used by the test spec to know where data is stored) -->
     <p id="pushId"></p>
 
     <!-- Clear Firebase button -->
diff --git a/tests/protractor/priority/priority.spec.js b/tests/protractor/priority/priority.spec.js
@@ -37,10 +37,10 @@ describe('Priority App', function () {
 
   beforeEach(function (done) {
     if (!isPageLoaded) {
+      isPageLoaded = true;
+
       // Navigate to the priority app
       browser.get('priority/priority.html').then(function() {
-        isPageLoaded = true;
-
         // Get the random push ID where the data is being stored
         return $('#pushId').getText();
       }).then(function(pushId) {
diff --git a/tests/protractor/tictactoe/tictactoe.html b/tests/protractor/tictactoe/tictactoe.html
@@ -17,7 +17,7 @@
   </head>
 
   <body ng-controller="TicTacToeCtrl">
-  <!-- Firebase push ID where data is stored -->
+    <!-- Firebase push ID where data is stored (used by the test spec to know where data is stored) -->
     <p id="pushId"></p>
 
     <!-- Reset Firebase button -->
diff --git a/tests/protractor/tictactoe/tictactoe.spec.js b/tests/protractor/tictactoe/tictactoe.spec.js
@@ -38,10 +38,10 @@ describe('TicTacToe App', function () {
 
   beforeEach(function (done) {
     if (!isPageLoaded) {
+      isPageLoaded = true;
+
       // Navigate to the tictactoe app
       browser.get('tictactoe/tictactoe.html').then(function() {
-        isPageLoaded = true;
-
         // Get the random push ID where the data is being stored
         return $('#pushId').getText();
       }).then(function(pushId) {
@@ -99,6 +99,7 @@ describe('TicTacToe App', function () {
     browser.get('tictactoe/tictactoe.html?pushId=' + firebaseRef.key()).then(function() {
       // Wait for AngularFire to sync the initial state
       sleep();
+      sleep();
 
       // Make sure the board has 9 cells
       expect(cells.count()).toBe(9);
diff --git a/tests/protractor/todo/todo.html b/tests/protractor/todo/todo.html
@@ -18,7 +18,7 @@
 
   <body ng-controller="TodoCtrl">
     <div>
-      <!-- Firebase push ID where data is stored -->
+      <!-- Firebase push ID where data is stored (used by the test spec to know where data is stored) -->
       <p id="pushId"></p>
 
       <!-- Clear Firebase button -->
diff --git a/tests/protractor/todo/todo.spec.js b/tests/protractor/todo/todo.spec.js
@@ -36,10 +36,10 @@ describe('Todo App', function () {
 
   beforeEach(function (done) {
     if (!isPageLoaded) {
+      isPageLoaded = true;
+
       // Navigate to the todo app
       browser.get('todo/todo.html').then(function() {
-        isPageLoaded = true;
-
         // Get the random push ID where the data is being stored
         return $('#pushId').getText();
       }).then(function(pushId) {
