Skip to content
Browse files

Don't require test/unit too early.

If so, triggers autorun with cucumber causing a 
non-zero exit status.
  • Loading branch information...
1 parent b554a1e commit b15bb01302eab387af2432bcbfb197476e99d9d8 @cmeiklejohn cmeiklejohn committed
Showing with 2 additions and 1 deletion.
  1. +1 −1 Gemfile
  2. +1 −0 test/test_helper.rb
View
2 Gemfile
@@ -52,7 +52,7 @@ group :test do
gem 'nokogiri'
gem 'rack-test', :require => 'rack/test'
gem 'rr'
- gem 'shoulda'
+ gem 'shoulda', :require => false
#gem 'test-unit', :require => 'test/unit'
gem 'timecop'
gem 'webmock'
View
1 test/test_helper.rb
@@ -40,6 +40,7 @@ class ActionController::TestCase
end
end
+require 'shoulda'
require 'clearance/testing'
require 'capybara/rails'

0 comments on commit b15bb01

Please sign in to comment.
Something went wrong with that request. Please try again.