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

Upgrade Intern for better ES6 compat #417

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
10 changes: 8 additions & 2 deletions devbox/provisioning.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cp /vagrant/devbox/prosody.cfg.lua /etc/prosody/prosody.cfg.lua
#
apt-get install -y nginx
cp /vagrant/devbox/nginx-default.conf /etc/nginx/sites-available/default
sed --in-place 's|{{ROOT_DIR}}|/vagrant|g' /etc/nginx/sites-available/default/nginx-default.conf
sed --in-place 's|{{ROOT_DIR}}|/vagrant|g' /etc/nginx/sites-available/default
/etc/init.d/nginx restart

#
Expand All @@ -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"}]
});