Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Upgrade Intern for better ES6 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
benlangfeld committed Sep 17, 2015
1 parent 3bad2bc commit d5cd302
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 7 additions & 1 deletion devbox/provisioning.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ su -u vagrant bower install
#
# Selenium & PhantomJS for testing
#
cd
apt-get install -y openjdk-7-jre
mkdir /usr/lib/selenium/
wget --no-verbose --output-document=/usr/lib/selenium/selenium-server-standalone-2.42.2.jar -- http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
Expand All @@ -59,4 +60,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
apt-get install -y 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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.3",
"jshint-stylish": "^0.2.0",
"lolex": "^1.2.0",
"sinon": "^1.10.3",
Expand Down
11 changes: 2 additions & 9 deletions tests/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.' }
Expand All @@ -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"}]
});

0 comments on commit d5cd302

Please sign in to comment.