Merge pull request #54 from patdeegan/test-cleanups

Test cleanups.

DEVELOPMENT.md

@@ -7,13 +7,11 @@ on Discourse with:
 
 ### Getting Started
 
-1. Install the Xcode tools: https://developer.apple.com/xcode/
+1. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
-2. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
+2. Install Vagrant: https://www.vagrantup.com/
-3. Install Ruby 1.9.3. We recommend RVM: https://rvm.io/
+3. Open a terminal
-4. Open a terminal
+4. Clone the project: `git@github.com:discourse/discourse.git`
-5. Clone the project: `git@github.com:discourse/discourse.git`
+5. Enter the project directory: `cd discourse`
-6. Enter the project directory: `cd discourse`
-7. Install vagrant: `gem install vagrant`
 
 ### Using Vagrant
 
@@ -22,7 +20,7 @@ When you're ready to start working, boot the VM:
 vagrant up
 ```
 
-It should prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
+On Windows, it will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
 
 (The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)
 

Gemfile

@@ -102,7 +102,7 @@ group :test, :development do
   gem 'image_optim'
   gem 'certified'
   gem 'rb-fsevent'
-  gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'rb-inotify', '~> 0.8.8', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
   gem 'terminal-notifier-guard', :require => RUBY_PLATFORM.include?('darwin') && 'terminal-notifier-guard'
 end
 

Gemfile.lock

@@ -256,7 +256,7 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.8.8)
       ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
@@ -416,7 +416,7 @@ DEPENDENCIES
   rails_multisite!
   rake
   rb-fsevent
-  rb-inotify
+  rb-inotify (~> 0.8.8)
   redis
   redis-rails
   rest-client

Guardfile

@@ -1,4 +1,4 @@
-guard 'spork' do
+guard :spork, wait: 120 do
   watch('config/application.rb')
   watch('config/environment.rb')
   watch(%r{^config/environments/.*\.rb$})
@@ -27,7 +27,7 @@ guard 'jasmine', jasmine_options do watch(%r{spec/javascripts/spec\.(js\.coffee|
   watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)$})  { "spec/javascripts" }
 end
 
-guard 'rspec', :focus_on_failed => true, :version => 2, :cli => "--drb" do
+guard 'rspec', :focus_on_failed => true, :cli => "--drb" do
   watch(%r{^spec/.+_spec\.rb$})
   #watch(%r{^lib/jobs/(.+)\.rb$})     { |m| "spec/components/jobs/#{m[1]}_spec.rb" }  
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/components/#{m[1]}_spec.rb" }  

Vagrantfile

@@ -1,14 +1,29 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
 # See https://github.com/discourse/core/blob/master/DEVELOPMENT.md
 #
 Vagrant::Config.run do |config|
   config.vm.box = 'discourse-pre'
   config.vm.box_url = 'http://www.discourse.org/vms/discourse-pre.box'
+
+  # Make this VM reachable on the host network as well, so that other
+  # VM's running other browsers can access our dev server.
   config.vm.network :hostonly, '192.168.10.200'
 
+  # Make it so that network access from the vagrant guest is able to
+  # use SSH private keys that are present on the host without copying
+  # them into the VM.
+  config.ssh.forward_agent = true
+
+  # This setting gives the VM 512MB of MEMORIES instead of the default 384.
+  config.vm.customize ["modifyvm", :id, "--memory", 512]
+
+  # This setting makes it so that network access from inside the vagrant guest
+  # is able to resolve DNS using the hosts VPN connection.
+  config.vm.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+
   config.vm.forward_port 3000, 4000
   config.vm.forward_port 1080, 4080 # Mailcatcher
 
-  if RUBY_PLATFORM =~ /darwin/
+  config.vm.share_folder("v-root", "/vagrant", ".")
-    config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)
-  end
 end