Permalink
Browse files

Bump up spork in the Guardfile so that it loads first. Add --color to…

… .rspec.
  • Loading branch information...
1 parent 1cc5109 commit b191cf5c60e7711ad76cbd8b93399d02d7f8b35a @ugisozols ugisozols committed Jul 10, 2012
Showing with 11 additions and 12 deletions.
  1. +1 −0 .rspec
  2. +9 −11 Guardfile
  3. +1 −1 spec/models/refinery/news/item_spec.rb
View
@@ -0,0 +1 @@
+--color
View
@@ -1,20 +1,18 @@
-guard 'rspec', :version => 2, :cli => "--color" do
+guard 'spork', :wait => 60, :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
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" }
watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
watch('spec/spec_helper.rb') { "spec" }
- watch('config/routes.rb') { "spec/routing" }
- watch('app/controllers/application_controller.rb') { "spec/controllers" }
# Capybara request specs
watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
end
-
-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
@@ -88,4 +88,4 @@ module News
end
end
end
-end
+end

0 comments on commit b191cf5

Please sign in to comment.