diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Guardfile | 10 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 66 |
3 files changed, 21 insertions, 57 deletions
@@ -32,8 +32,6 @@ group :development, :test do end platforms :ruby do - gem 'guard-spork', '~> 1.1.0' - unless ENV['TRAVIS'] if RbConfig::CONFIG['target_os'] =~ /darwin/i gem 'rb-fsevent', '~> 0.9.1' @@ -1,12 +1,4 @@ -guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' } do - watch('config/application.rb') - watch('config/environment.rb') - watch(%r{^config/environments/.+\.rb$}) - watch(%r{^config/initializers/.+\.rb$}) - watch('spec/spec_helper.rb') -end - -guard 'rspec', :version => 2, :cli => "--color --drb" do +guard 'rspec', :version => 2, :cli => "--color" do watch(%r{^spec/.+_spec\.rb$}) watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a313bbb..4b29712 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,56 +1,30 @@ require 'rubygems' -def setup_environment - # Configure Rails Environment - ENV["RAILS_ENV"] ||= 'test' +# Configure Rails Environment +ENV["RAILS_ENV"] ||= 'test' - require File.expand_path("../dummy/config/environment", __FILE__) +require File.expand_path("../dummy/config/environment", __FILE__) - require 'rspec/rails' - require 'capybara/rspec' - require 'factory_girl_rails' +require 'rspec/rails' +require 'capybara/rspec' +require 'factory_girl_rails' - Rails.backtrace_cleaner.remove_silencers! +Rails.backtrace_cleaner.remove_silencers! - RSpec.configure do |config| - config.mock_with :rspec - config.treat_symbols_as_metadata_keys_with_true_values = true - config.filter_run :focus => true - config.run_all_when_everything_filtered = true - end - - # set javascript driver for capybara - Capybara.javascript_driver = :selenium -end - -def each_run - ActiveSupport::Dependencies.clear - - FactoryGirl.reload - - # Requires supporting files with custom matchers and macros, etc, - # in ./support/ and its subdirectories including factories. - ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p| - Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s] - }.flatten.sort.each do |support_file| - require support_file - end +RSpec.configure do |config| + config.mock_with :rspec + config.treat_symbols_as_metadata_keys_with_true_values = true + config.filter_run :focus => true + config.run_all_when_everything_filtered = true 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 - # Loading more in this block will cause your tests to run faster. However, - # if you change any configuration or code from libraries loaded here, you'll - # need to restart spork for it take effect. - setup_environment - end +# set javascript driver for capybara +Capybara.javascript_driver = :selenium - Spork.each_run do - # This code will be run each time you run your specs. - each_run - end -else - setup_environment - each_run +# Requires supporting files with custom matchers and macros, etc, +# in ./support/ and its subdirectories including factories. +([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p| + Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s] +}.flatten.sort.each do |support_file| + require support_file end |