Rework the mongoid_test_helper such that we don't blow up for lack of Geocoder::Model::Mongoid

test/mongoid_test.rb

 # encoding: utf-8
-require 'test_helper'
-
-begin
-require 'mongoid'
 require 'mongoid_test_helper'
 
 class MongoidTest < Test::Unit::TestCase
-
   def test_geocoded_check
     p = Place.new(*venue_params(:msg))
     p.location = [40.750354, -73.993371]
@@ -25,7 +20,3 @@ class MongoidTest < Test::Unit::TestCase
     assert_equal p.selector[:location]['$nearSphere'], location.reverse
   end
 end
-
-rescue LoadError
-  warn 'Mongoid not installed, not tested.'
-end

test/mongoid_test_helper.rb

 require 'rubygems'
 require 'test/unit'
+require 'test_helper'
+require 'mongoid'
+require 'geocoder/models/mongoid'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))