1 files changed, 16 insertions, 11 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a3fe107..b8df592 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,34 +6,39 @@ def setup_environment
   # need to restart spork for it take effect.
   
   # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+  ENV["RAILS_ENV"] = 'test'
   require File.expand_path("../dummy/config/environment.rb",  __FILE__)
     
   require 'rspec/rails'
   require 'capybara/rspec'
-  require 'factory_girl'
-  require 'refinerycms-testing'
-
+  
   Rails.backtrace_cleaner.remove_silencers!
 
-  Dir[
-    File.expand_path("../support/**/*.rb", __FILE__),
-    File.expand_path("../factories/**/*.rb", __FILE__)
-  ].each {|f| require f}
-
   RSpec.configure do |config|
     config.mock_with :rspec
-    config.use_transactional_fixtures = false
   end
 end
 
-def each_run
+def each_run  
+  require 'factory_girl_rails'
+  require 'refinerycms-testing'
+  
+  Dir[File.expand_path("../../app/models/**/*.rb", __FILE__)].each do |model|
+    load model
+  end
+  
+  Dir[
+    File.expand_path("../support/**/*.rb", __FILE__),
+    File.expand_path("../factories/**/*.rb", __FILE__)
+  ].each {|f| require f}
 end
 
 # If spork is available in the Gemfile it'll be used but we don't force it.
 unless (begin; require 'spork'; rescue LoadError; nil end).nil?
   Spork.prefork do
     setup_environment
+    
+    ActiveSupport::Dependencies.clear
   end
 
   Spork.each_run do