Skip to content
Browse files

Fixing the mocha load order so Travis builds work again.

  • Loading branch information...
1 parent 4052027 commit b2e81cf4352dea47f00b9b77cdef3ddf5e05ce61 @amerine amerine committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 test/helper.rb
View
4 test/helper.rb
@@ -1,7 +1,7 @@
require "rubygems"
require "bundler/setup"
-require "mocha"
require "minitest/unit"
+require "mocha"
require "active_record"
require 'active_support/core_ext/time/conversions'
@@ -84,4 +84,4 @@ def test(name, &block)
require "schema"
require "shared"
FriendlyId::Test::Database.connect
-at_exit {ActiveRecord::Base.connection.disconnect!}
+at_exit {ActiveRecord::Base.connection.disconnect!}

0 comments on commit b2e81cf

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