mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 07:37:25 +01:00
Merge branch 'develop' into TheHollidayInn-challenges-clone
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -15,6 +15,7 @@ newrelic_agent.log
|
||||
.bower-registry
|
||||
.bower-cache
|
||||
.vagrant
|
||||
Vagrantfile
|
||||
|
||||
*.log
|
||||
src/*/*.map
|
||||
|
||||
@@ -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"
|
||||
9
test/spec/mocks/sandbox.js
Normal file
9
test/spec/mocks/sandbox.js
Normal file
@@ -0,0 +1,9 @@
|
||||
var sandbox;
|
||||
|
||||
beforeEach(function() {
|
||||
sandbox = sinon.sandbox.create();
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
sandbox.restore();
|
||||
});
|
||||
@@ -1,14 +1,5 @@
|
||||
beforeEach(module('habitrpg'));
|
||||
|
||||
var sandbox;
|
||||
beforeEach(function() {
|
||||
sandbox = sinon.sandbox.create();
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
sandbox.restore();
|
||||
});
|
||||
|
||||
var specHelper = {};
|
||||
|
||||
(function(){
|
||||
|
||||
Reference in New Issue
Block a user