stop using autoload because tests fail on 1.8.7

badie · Dec 11, 2011 · ef1e813 · ef1e813
1 parent 507617c
commit ef1e813
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/kaminari.gemspec b/kaminari.gemspec
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   %w{ activerecord activemodel }.each do |gem|
     s.add_development_dependency gem, ['>= 3.0.0']
   end
+  s.add_development_dependency 'sinatra', ['>= 1.3']
   s.add_development_dependency 'mongoid', ['>= 2']
   s.add_development_dependency 'mongo_mapper', ['>= 0.9']
   s.add_development_dependency 'dm-core', ['>= 1.1.0']

diff --git a/lib/kaminari/sinatra.rb b/lib/kaminari/sinatra.rb
@@ -5,10 +5,9 @@
 end
 
 require 'kaminari'
-module Kaminari
-  module Helpers
-    autoload :SinatraHelpers, 'kaminari/helpers/sinatra_helpers'
-  end
+module Kaminari::Helpers
 end
+require 'kaminari/helpers/sinatra_helpers'
+
 Kaminari::Hooks.init!
 
diff --git a/spec/spec_helper_for_sinatra.rb b/spec/spec_helper_for_sinatra.rb
@@ -1,4 +1,3 @@
-require 'sinatra/base'
 require 'kaminari/sinatra'
 require 'rack/test'
 require 'sinatra/test_helpers'