Merge branch 'develop' into TheHollidayInn-challenges-clone

This commit is contained in:
Blade Barringer 2015-06-21 20:05:20 -05:00
commit 10c709a9f2
4 changed files with 12 additions and 9 deletions

1
.gitignore vendored
View file

@ -15,6 +15,7 @@ newrelic_agent.log
.bower-registry
.bower-cache
.vagrant
Vagrantfile
*.log
src/*/*.map

View file

@ -6,6 +6,8 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 768
v.cpus = 1
v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
end
config.vm.box = "thepeopleseason/habitrpg"

View file

@ -0,0 +1,9 @@
var sandbox;
beforeEach(function() {
sandbox = sinon.sandbox.create();
});
afterEach(function() {
sandbox.restore();
});

View file

@ -1,14 +1,5 @@
beforeEach(module('habitrpg'));
var sandbox;
beforeEach(function() {
sandbox = sinon.sandbox.create();
});
afterEach(function() {
sandbox.restore();
});
var specHelper = {};
(function(){