krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into TheHollidayInn-challenges-clone

Browse Source
This commit is contained in:
Blade Barringer
2015-06-21 20:05:20 -05:00
parent 38e24571da b4c4b891a1
commit 10c709a9f2
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
Vagrantfile → Vagrantfile.example
View File

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

9
test/spec/mocks/sandbox.js Normal file
View File

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

9
test/spec/specHelper.js
View File

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