Upgrade Intern for better ES6 compat

4 files changed, 10 insertions, 12 deletions

diff --git a/Vagrantfile b/Vagrantfile
index 8682f53..996df52 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,6 +17,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provider "virtualbox" do |v|
     v.name = "candy"
-    v.customize ["modifyvm", :id, "--memory", 768]
+    v.customize ["modifyvm", :id, "--memory", 2048]
   end
 end
diff --git a/devbox/provisioning.sh b/devbox/provisioning.sh
index aa8cd25..9636cf2 100644
--- a/devbox/provisioning.sh
+++ b/devbox/provisioning.sh
@@ -59,4 +59,9 @@ cp /vagrant/devbox/selenium.init.sh /etc/init.d/selenium
 chmod 755 /etc/init.d/selenium
 /etc/init.d/selenium start
 update-rc.d selenium defaults
-apt-get install -y phantomjs
+sudo apt-get install build-essential g++ flex bison gperf ruby perl libsqlite3-dev libfontconfig1-dev libicu-dev libfreetype6 libssl-dev libpng-dev libjpeg-dev python libx11-dev libxext-dev
+git clone git://github.com/ariya/phantomjs.git
+cd phantomjs
+git checkout 2.0
+./build.sh --confirm
+sudo cp bin/* /usr/local/bin
diff --git a/package.json b/package.json
index 5103e4e..f769158 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "grunt-prompt": "^1.3.0",
     "grunt-sync-pkg": "^0.1.2",
     "grunt-todo": "~0.4.0",
-    "intern": "^2.0.1",
+    "intern": "^3.0.0",
     "jshint-stylish": "^0.2.0",
     "lolex": "^1.2.0",
     "sinon": "^1.10.3",
diff --git a/tests/intern.js b/tests/intern.js
index 52d4140..ef703b4 100644
--- a/tests/intern.js
+++ b/tests/intern.js
@@ -38,16 +38,9 @@ define({
 	// Name of the tunnel class to use for WebDriver tests
 	tunnel: 'SauceLabsTunnel',
 
-	// The desired AMD loader to use when running unit tests (client.html/client.js). Omit to use the default Dojo
-	// loader
-	useLoader: {
-		'host-node': 'dojo/dojo',
-		'host-browser': 'node_modules/dojo/dojo.js'
-	},
-
 	// Configuration options for the module loader; any AMD configuration options supported by the specified AMD loader
 	// can be used here
-	loader: {
+	loaderOptions: {
 		// Packages that should be registered with the loader in each testing environment
 		packages: [
 				{ name: 'candy', location: '.' }
@@ -67,5 +60,5 @@ define({
 	// A regular expression matching URLs to files that should not be included in code coverage analysis
 	excludeInstrumentation: /^(?:tests\/|node_modules\/|bower_components\/|libs\.[^.]+\.js)/,
 
-	reporters: ['runner', 'lcov']
+	reporters: ['Runner', {"id":"Lcov","filename":"lcov.info"}]
 });