From ebb624bdc3c40d989f2027da4b15876cb9cc9519 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sun, 24 Jun 2012 09:10:25 +1000
Subject: [PATCH] Reload application files, routes and factories each spork run

---
 Gemfile                         |  2 +-
 config/initializers/spree.rb    |  2 +-
 spec/{support => }/factories.rb |  0
 spec/spec_helper.rb             | 27 +++++++++++++++++----------
 4 files changed, 19 insertions(+), 12 deletions(-)
 rename spec/{support => }/factories.rb (100%)

diff --git a/Gemfile b/Gemfile
index ee3e7cf252..fda000b35c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ group :test, :development do
   gem 'turn', '~> 0.8.3', :require => false
   gem 'rspec-rails'
   gem 'shoulda-matchers'
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', :require => false
   gem 'faker'
   gem 'capybara'
   gem 'database_cleaner', '0.7.1', :require => false
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 287475382f..09c05769e1 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -16,7 +16,7 @@ Spree.config do |config|
   # config.shipping_instructions = true
   config.checkout_zone = 'Australia'
   config.address_requires_state = true
-  config.default_country_id  = 12 # This should be Australia, see:spree/core/db/default/spree/countries.yml
+  config.default_country_id  = 12 # This should be Australia, see: spree/core/db/default/spree/countries.yml
 
   config.searcher_class = OpenFoodWeb::Searcher
 end
diff --git a/spec/support/factories.rb b/spec/factories.rb
similarity index 100%
rename from spec/support/factories.rb
rename to spec/factories.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 77abe0c2ef..13c0c9af75 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,15 +3,15 @@ require 'spork'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'capybara'
-require 'database_cleaner'
-
 
 Spork.prefork do
+  ENV["RAILS_ENV"] ||= 'test'
+  require File.expand_path("../../config/environment", __FILE__)
+  require 'rspec/rails'
+  require 'rspec/autorun'
+  require 'capybara'
+  require 'database_cleaner'
+
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
   Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
@@ -63,11 +63,18 @@ Spork.prefork do
     config.include Spree::UrlHelpers
     config.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
     config.include Devise::TestHelpers, :type => :controller
-    config.include FactoryGirl::Syntax::Methods
   end
 end
 
 Spork.each_run do
-  # Dir["#{File.dirname(__FILE__)}/../app/**/*.rb"].each {|f| load f}
-  # Rails.application.reload_routes!
+  Dir["#{File.dirname(__FILE__)}/../app/**/*.rb"].each {|f| load f}
+  Dir["#{File.dirname(__FILE__)}/../lib/**/*.rb"].each {|f| load f}
+
+  Rails.application.reload_routes!
+
+  require 'factory_girl_rails'
+
+  RSpec.configure do |config|
+    config.include FactoryGirl::Syntax::Methods
+  end
 end