migrated so tests to use setUp/tearDown - refs #397

-Subproject commit 2f5e1fcd2b9812b286a7eac98df327691b7558b7
+Subproject commit 442060c4b89053177962720d76e89468afd2918e

@@ -14,12 +14,19 @@ function fetchUA(request) {
     testUA(headers.pop().value, /plop/);
     testUA(headers.pop().value, /plop/);
 }
 }
 
 
-casper.test.begin('userAgent() tests', 3, function(test) {
+casper.test.begin('userAgent() tests', 3, {
+    originalUA: casper.options.pageSettings.userAgent,
+
+    tearDown: function(test) {
+        casper.userAgent(this.originalUA);
+    },
+
+    test: function(test) {
         testUA(casper.options.pageSettings.userAgent, /CasperJS/);
         testUA(casper.options.pageSettings.userAgent, /CasperJS/);
-    casper.start();
-    casper.userAgent('plop').once('resource.requested', fetchUA);
-    casper.thenOpen('tests/site/index.html');
-    casper.run(function() {
+        casper.start().userAgent('plop').once('resource.requested', fetchUA);
+        casper.thenOpen('tests/site/index.html').run(function() {
             test.done();
             test.done();
         });
         });
+    }
 });
 });
+

 /*global casper*/
 /*global casper*/
 /*jshint strict:false*/
 /*jshint strict:false*/
-casper.test.begin('alert events', 1, function(test) {
-    var ok = false;
+casper.test.begin('alert events', 1, {
+    ok: false,
+
+    tearDown: function(test) {
+        casper.removeAllListeners('remote.alert');
+    },
+
+    test: function(test) {
+        var self = this;
+
         casper.once('remote.alert', function(message) {
         casper.once('remote.alert', function(message) {
-        ok = message === 'plop';
+            self.ok = (message === 'plop');
         });
         });
+
         casper.start('tests/site/alert.html', function() {
         casper.start('tests/site/alert.html', function() {
-        test.assert(ok, 'alert event has been intercepted');
+            test.assert(self.ok, 'alert event has been intercepted');
         });
         });
+
         casper.run(function() {
         casper.run(function() {
-        this.removeAllListeners('remote.alert');
             test.done();
             test.done();
         });
         });
+    }
 });
 });

 /*global casper*/
 /*global casper*/
 /*jshint strict:false*/
 /*jshint strict:false*/
-var fs = require('fs'),
-    testFile = '/tmp/__casper_test_capture.png';
+var fs = require('fs');
 
 
-if (fs.exists(testFile) && fs.isFile(testFile)) {
-    fs.remove(testFile);
-}
+casper.test.begin('Casper.capture() tests', 1, {
+    testFile: '/tmp/__casper_test_capture.png',
 
 
-casper.test.begin('Casper.capture() tests', 1, function(test) {
-    casper.start('tests/site/index.html', function() {
-        this.viewport(300, 200);
-        this.capture(testFile);
-        test.assert(fs.isFile(testFile), 'Casper.capture() captured a screenshot');
-    }).run(function() {
+    setUp: function(test) {
+        if (fs.exists(this.testFile) && fs.isFile(this.testFile)) {
+            try {
+                fs.remove(this.testFile);
+            } catch (e) {
+            }
+        }
+    },
+
+    tearDown: function(test) {
         try {
         try {
-            fs.remove(testFile);
+            fs.remove(this.testFile);
         } catch(e) {
         } catch(e) {
-            this.warn('Unable to delete test file ' + testFile + '; please delete it manually');
         }
         }
+    },
+
+    test: function(test) {
+        var self = this;
+
+        casper.start('tests/site/index.html', function() {
+            this.viewport(300, 200);
+            this.capture(self.testFile);
+            test.assert(fs.isFile(self.testFile), 'Casper.capture() captured a screenshot');
+        });
+
+        casper.run(function() {
             test.done();
             test.done();
         });
         });
+    }
 });
 });
 
 
 casper.test.begin('Casper.captureBase64() tests', 3, function(test) {
 casper.test.begin('Casper.captureBase64() tests', 3, function(test) {