cleaned up phantomcss tests slightly

pgbovine · pgbovine · commit 07ae14a21734 · 2016-06-26T15:25:02.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ coding-the-matrix/
 node_modules/
 google-analytics.txt
 v3/opt_togetherjs/*.json
+# for regression tests
+*.diff.png
+*.fail.png
diff --git a/tests/frontend-regression-tests/Makefile b/tests/frontend-regression-tests/Makefile
@@ -1,5 +1,2 @@
 all:
 	casperjs test test-visualize-html.js
-
-clean:
-	rm -rf screenshots/
diff --git a/tests/frontend-regression-tests/README.txt b/tests/frontend-regression-tests/README.txt
@@ -13,4 +13,8 @@ Now the 'phantomjs' and 'casperjs' commands should both work
 
 
 Then install resemblejs locally:
+
 npm install resemblejs
+
+and make sure it appears in node_modules/ in this directory (and not in
+a parent directory)
diff --git a/tests/frontend-regression-tests/test-visualize-html.js b/tests/frontend-regression-tests/test-visualize-html.js
@@ -32,53 +32,28 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
   });
 
   // click on one example code for each language
-  casper.then(function() {
-    casper.click("#aliasExampleLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#tortureLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#javaVarLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#jsDatatypesExLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#tsGreeterExLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#rubyConstantsLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#cMengThesisLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
-  });
-
-  casper.then(function() {
-    casper.click("#cppFirstLink");
-    phantomcss.screenshot('#pyInputPane', 'pyInputPane');
+  var exampleLinksToClick = [
+    "#aliasExampleLink",
+    "#tortureLink",
+    "#javaVarLink",
+    "#jsDatatypesExLink",
+    "#tsGreeterExLink",
+    "#rubyConstantsLink",
+    "#cMengThesisLink",
+    "#cppFirstLink"];
+
+  exampleLinksToClick.forEach(function (e, i) {
+    casper.thenClick(e, function() {
+      phantomcss.screenshot('#pyInputPane', 'pyInputPane');
+    });
   });
 
 
   // now test the visualize mode:
-  casper.then(function() {
-    casper.click("#aliasExampleLink");
+  casper.thenClick("#aliasExampleLink", function() {
     // brief wait for code to load
     this.wait(DELAY_MS, function() {
-      casper.click("#executeBtn");
+      this.click("#executeBtn");
     });
   });
 
@@ -94,22 +69,20 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
 
   // this example has 31 steps:
   for (var i = 0; i < 31; i++) {
-    casper.then(function() {
-      casper.click("#jmpStepFwd");
+    casper.thenClick("#jmpStepFwd", function() {
       // slight pause for vis to settle
       this.wait(DELAY_MS, function() {
         phantomcss.screenshot('.visualizer', 'visualizer');
       });
     });
   }
 
+
   // for the remaining examples, be brief and take only a snapshot of
   // the FINAL state of the visualization
 
-
   // test instruction limit reached
-  casper.then(function() {
-    casper.click("#genPrimesLink");
+  casper.thenClick("#genPrimesLink", function() {
     // brief wait for code to load
     this.wait(DELAY_MS, function() {
       casper.click("#executeBtn");
@@ -120,17 +93,13 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
         });
       }, function then() {
         casper.click('#jmpLastInstr');
-        // slight pause for vis to settle
-        this.wait(DELAY_MS, function() {
-          phantomcss.screenshot('.visualizer', 'visualizer_instr_limit_reached');
-        });
+        phantomcss.screenshot('.visualizer', 'visualizer_instr_limit_reached');
       });
     });
   });
 
   // test exception
-  casper.then(function() {
-    casper.click("#pwTryFinallyLink");
+  casper.thenClick("#pwTryFinallyLink", function() {
     // brief wait for code to load
     this.wait(DELAY_MS, function() {
       casper.click("#executeBtn");
@@ -141,17 +110,21 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
         });
       }, function then() {
         casper.click('#jmpLastInstr');
-        // slight pause for vis to settle
-        this.wait(DELAY_MS, function() {
-          phantomcss.screenshot('.visualizer', 'visualizer_exception');
-        });
+        phantomcss.screenshot('.visualizer', 'visualizer_exception');
       });
     });
   });
 
 
   // for these examples, just snapshot dataViz to be even briefer:
-  var exampleTestLinks = ['#tutorialExampleLink', '#ll2Link', '#inheritanceExampleLink', '#aliasing2Link', '#aliasing3Link', '#aliasing7Link', '#closure5Link'];
+  var exampleTestLinks = [
+    '#tutorialExampleLink',
+    '#ll2Link',
+    '#inheritanceExampleLink',
+    '#aliasing2Link',
+    '#aliasing3Link',
+    '#aliasing7Link',
+    '#closure5Link'];
 
   exampleTestLinks.forEach(function(e, i) {
     // reset all toggles to test regular visualizer
@@ -173,10 +146,7 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
           });
         }, function then() {
           casper.click('#jmpLastInstr');
-          // slight pause for vis to settle
-          this.wait(DELAY_MS, function() {
-            phantomcss.screenshot('#dataViz', 'dataViz_' + e);
-          });
+          phantomcss.screenshot('#dataViz', 'dataViz_' + e);
         });
       });
     });
@@ -200,10 +170,7 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
           });
         }, function then() {
           casper.click('#jmpLastInstr');
-          // slight pause for vis to settle
-          this.wait(DELAY_MS, function() {
-            phantomcss.screenshot('#dataViz', 'dataViz_' + e + '_CUMULATIVE');
-          });
+          phantomcss.screenshot('#dataViz', 'dataViz_' + e + '_CUMULATIVE');
         });
       });
     });
@@ -227,10 +194,7 @@ casper.test.begin('Testing ' + htmlPath, function (test) {
           });
         }, function then() {
           casper.click('#jmpLastInstr');
-          // slight pause for vis to settle
-          this.wait(DELAY_MS, function() {
-            phantomcss.screenshot('#dataViz', 'dataViz_' + e + '_TEXTLABELS');
-          });
+          phantomcss.screenshot('#dataViz', 'dataViz_' + e + '_TEXTLABELS');
         });
       });
     });

-Original file line number
+Diff line change
@@ @@ -1,5 +1,2 @@ @@
 all:
 	casperjs test test-visualize-html.js
+-
 -clean:
 -	rm -rf screenshots/