Merge pull request #85 from lunks/use-mocha-setup

Requiring mocha/setup instead of mocha on test_helper. This fixes a deprecation warning.

Author: Lordnibbler

test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
 require 'ruby-debug'
+require 'mocha/setup'
 require 'timecop'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))