added Casper.back() and .forward() for navigating history

@@ -89,6 +89,19 @@
      */
      */
     phantom.Casper.prototype = {
     phantom.Casper.prototype = {
         /**
         /**
+         * Go a step back in browser's history
+         *
+         * @return Casper
+         */
+        back: function() {
+            return this.then(function(self) {
+                self.evaluate(function() {
+                    history.back();
+                });
+            });
+        },
+
+        /**
          * Encodes a resource using the base64 algorithm synchroneously using
          * Encodes a resource using the base64 algorithm synchroneously using
          * client-side XMLHttpRequest.
          * client-side XMLHttpRequest.
          *
          *
@@ -465,6 +478,19 @@
         },
         },
 
 
         /**
         /**
+         * Go a step forward in browser's history
+         *
+         * @return Casper
+         */
+        forward: function(then) {
+            return this.then(function(self) {
+                self.evaluate(function() {
+                    history.forward();
+                });
+            });
+        },
+
+        /**
          * Retrieve current document url.
          * Retrieve current document url.
          *
          *
          * @return String
          * @return String
@@ -1250,8 +1276,8 @@
                 exporter.addSuccess("unknown", message);
                 exporter.addSuccess("unknown", message);
             } else {
             } else {
                 casper.echo(this.colorize(FAIL, 'RED_BAR') + ' ' + this.formatMessage(message, 'WARNING'));
                 casper.echo(this.colorize(FAIL, 'RED_BAR') + ' ' + this.formatMessage(message, 'WARNING'));
-                this.comment('     got:      ' + testValue);
-                this.comment('     expected: ' + expected);
+                this.comment('   got:      ' + testValue);
+                this.comment('   expected: ' + expected);
                 this.testResults.failed++;
                 this.testResults.failed++;
                 exporter.addFailure("unknown", message, "test failed; expected: " + expected + "; got: " + testValue, "assertEquals");
                 exporter.addFailure("unknown", message, "test failed; expected: " + expected + "; got: " + testValue, "assertEquals");
             }
             }
@@ -1298,7 +1324,17 @@
          * @param  String   message    Test description
          * @param  String   message    Test description
          */
          */
         this.assertMatch = function(subject, pattern, message) {
         this.assertMatch = function(subject, pattern, message) {
-            return this.assert(pattern.test(subject), message);
+            if (pattern.test(subject)) {
+                casper.echo(this.colorize(PASS, 'INFO') + ' ' + this.formatMessage(message));
+                this.testResults.passed++;
+                exporter.addSuccess("unknown", message);
+            } else {
+                casper.echo(this.colorize(FAIL, 'RED_BAR') + ' ' + this.formatMessage(message, 'WARNING'));
+                this.comment('   subject: ' + subject);
+                this.comment('   pattern: ' + pattern.toString());
+                this.testResults.failed++;
+                exporter.addFailure("unknown", message, "test failed; subject: " + subject + "; pattern: " + pattern.toString(), "assertMatch");
+            }
         };
         };
 
 
         /**
         /**

@@ -186,11 +186,12 @@ casper.then(function(self) {
 });
 });
 
 
 // Casper.wait()
 // Casper.wait()
-var start = new Date().getTime();
-casper.wait(1000, function(self) {
+var waitStart;
+casper.then(function() {
+    waitStart = new Date().getTime();
+}).wait(1000, function(self) {
     self.test.comment('wait');
     self.test.comment('wait');
-    self.test.assert(new Date().getTime() - start > 1000, 'Casper.wait() can wait for a given amount of time');
-
+    self.test.assert(new Date().getTime() - waitStart > 1000, 'Casper.wait() can wait for a given amount of time');
     // Casper.waitFor()
     // Casper.waitFor()
     casper.thenOpen('tests/site/waitFor.html', function(self) {
     casper.thenOpen('tests/site/waitFor.html', function(self) {
         casper.test.comment('waitFor');
         casper.test.comment('waitFor');
@@ -206,12 +207,29 @@ casper.wait(1000, function(self) {
     });
     });
 });
 });
 
 
+// History
+casper
+    .thenOpen('tests/site/page1.html')
+    .thenOpen('tests/site/page2.html')
+    .thenOpen('tests/site/page3.html')
+    .back()
+    .then(function(self) {
+        self.test.comment('navigating history backward');
+        self.test.assertMatch(self.getCurrentUrl(), /tests\/site\/page2\.html$/, 'Casper.back() can go back an history step');
+    })
+    .forward()
+    .then(function(self) {
+        self.test.comment('navigating history forward');
+        self.test.assertMatch(self.getCurrentUrl(), /tests\/site\/page3\.html$/, 'Casper.forward() can go forward an history step');
+    })
+;
+
 // run suite
 // run suite
 casper.run(function(self) {
 casper.run(function(self) {
+    casper.test.comment('history');
+    casper.test.assert(self.history.length > 0, 'Casper.history contains urls');
+    casper.test.assertMatch(self.history[0], /tests\/site\/index\.html$/, 'Casper.history has the correct first url');
     self.test.comment('logging, again');
     self.test.comment('logging, again');
     self.test.assertEquals(self.result.log.length, 3, 'log() logged messages');
     self.test.assertEquals(self.result.log.length, 3, 'log() logged messages');
-    self.test.comment('history');
-    self.test.assert(self.history.length > 0, 'Casper.history contains urls');
-    self.test.assertMatch(self.history[0], /tests\/site\/index\.html$/, 'Casper.history has the correct first url');
     self.test.renderResults(true, 0, save);
     self.test.renderResults(true, 0, save);
 });
 });