diff --git a/.gitignore b/.gitignore index 4ae45467dc..dd55d8ea09 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ newrelic_agent.log .bower-registry .bower-cache .vagrant +Vagrantfile *.log src/*/*.map diff --git a/Vagrantfile b/Vagrantfile.example similarity index 95% rename from Vagrantfile rename to Vagrantfile.example index c0fb32fe35..52ffdf1096 100644 --- a/Vagrantfile +++ b/Vagrantfile.example @@ -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" diff --git a/test/spec/mocks/sandbox.js b/test/spec/mocks/sandbox.js new file mode 100644 index 0000000000..f095eefd09 --- /dev/null +++ b/test/spec/mocks/sandbox.js @@ -0,0 +1,9 @@ +var sandbox; + +beforeEach(function() { + sandbox = sinon.sandbox.create(); +}); + +afterEach(function() { + sandbox.restore(); +}); diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js index 9ddacdac52..80f5858fe8 100644 --- a/test/spec/specHelper.js +++ b/test/spec/specHelper.js @@ -1,15 +1,5 @@ beforeEach(module('habitrpg')); -var sandbox; - -beforeEach(function() { - sandbox = sinon.sandbox.create(); -}); - -afterEach(function() { - sandbox.restore(); -}); - specHelper = { newUser: function(){ var buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false}; diff --git a/website/views/static/front.jade b/website/views/static/front.jade index adb61d05c2..f518838463 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -70,8 +70,8 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') a(href='/static/contact')=env.t('contactUs') li button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()')= env.t('playButtonFull') - #intro - h1(ng-cloak) {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }} + #intro(ng-cloak) + h1 {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }} img.center-block.img-responsive(src='https://s3.amazonaws.com/habitrpg-assets/front/images/intro.png') // insert intro images .introcall.bg-success