Use Bundler. Move all test setup to one file.

haml · Apr 28, 2012 · 3d538ec · 3d538ec
1 parent 1bf376b
commit 3d538ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,2 @@
+source :rubygems
+gemspec
diff --git a/haml.gemspec b/haml.gemspec
@@ -19,6 +19,7 @@ HAML_GEMSPEC = Gem::Specification.new do |spec|
   spec.add_development_dependency 'maruku', '>= 0.5.9'
   spec.add_development_dependency 'hpricot'
   spec.add_development_dependency 'sass'
+  spec.add_development_dependency 'rails'
   spec.add_development_dependency 'ruby_parser'
 
   readmes = Dir['*'].reject{ |x| x =~ /(^|[^.a-z])[a-z]+/ || x == "TODO" }

diff --git a/test/linked_rails.rb b/test/linked_rails.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,11 +1,26 @@
 require 'rubygems'
+require 'bundler/setup'
+require 'action_pack'
+require 'action_controller'
+require 'action_view'
 
-lib_dir = File.dirname(__FILE__) + '/../lib'
-require File.dirname(__FILE__) + '/linked_rails'
+begin
+  require 'rails'
+  class TestApp < Rails::Application
+    config.root = ""
+  end
+  Rails.application = TestApp
+
+# For Rails 2.x
+rescue LoadError
+  require 'initializer'
+  RAILS_ROOT = ""
+end
+
+ActionController::Base.logger = Logger.new(nil)
 
 require 'test/unit'
 require 'fileutils'
-$:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 
 require 'haml/template'