Prepare tests to run with browserify

Makefile

@@ -26,8 +26,10 @@ dist_folder:
 
 dist: dist_folder dist/torque.js
 
+prepare-test-suite:
+	browserify test/suite.js > test/suite-bundle.js
+
 clean: 
 	rm -rf dist
 
 .PHONY: clean dist_folder
-

test/core.js

@@ -1,4 +1,6 @@
-module('torque.core.Event');
+var torque = require('../lib/torque');
+
+QUnit.module('torque.core.Event');
 
   function TestObj(){}
   TestObj.prototype = torque.Event;

test/provider.json.js

@@ -1,8 +1,10 @@
+var torque = require('../lib/torque');
+var providers = torque.providers;
 
 var json, url;
-module('provider.json')
+QUnit.module('provider.json');
 QUnit.testStart(function() {
-    json = new torque.providers.json({
+    json = new providers.json({
       table: 'test',
       user: "rambo",
       resolution: 1,

test/provider.jsonarray.js

@@ -1,5 +1,7 @@
+var torque = require('../lib/torque/core');
+var jsonarray_fixture = require('./data/torque.array.json');
 
-module('provider.jsonarray');
+QUnit.module('provider.jsonarray');
 
 test("processTile", function() {
   var json = new torque.providers.JsonArray({

test/provider.windshaft.test.js

@@ -1,7 +1,9 @@
+var torque = require('../lib/torque/core');
+
 var windshaft, url;
 var lastCall;
 var old_net;
-module('provider.windshaft', {
+QUnit.module('provider.windshaft', {
   setup: function() {
     old_net = torque.net.jsonp;
     old_get = torque.net.get;

test/renderer/point.js

@@ -1,4 +1,6 @@
-module('renderer/point');
+var torque = require('../../lib/torque');
+
+QUnit.module('renderer/point');
 
 var DEFAULT_CARTOCSS = [
   'Map {',

test/request.js

@@ -1,6 +1,8 @@
-module('request')
+var torque = require('../lib/torque/core');
 
-asyncTest("json", 6, function() {
+QUnit.module('request');
+
+asyncTest("json", 6, function(assert) {
   var called = null;
   torque.net.jsonp('http://test.com?callback=?', function(test) {
     called = arguments;

test/torque.js

@@ -1,5 +1,6 @@
+var torque = require('../lib/torque/core');
 
-module('torque');
+QUnit.module('torque');
 
 
 test('gets metadata from cartocss', function() {