From 3d538ec3940adfc34d40d143f62fdecee9a5bd22 Mon Sep 17 00:00:00 2001
From: Norman Clarke <norman@njclarke.com>
Date: Fri, 27 Apr 2012 12:25:40 -0300
Subject: [PATCH] Use Bundler. Move all test setup to one file.

---
 Gemfile              |  2 ++
 haml.gemspec         |  1 +
 test/linked_rails.rb | 18 ------------------
 test/test_helper.rb  | 21 ++++++++++++++++++---
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 Gemfile
 delete mode 100644 test/linked_rails.rb

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000..df87cd4ecc
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source :rubygems
+gemspec
\ No newline at end of file
diff --git a/haml.gemspec b/haml.gemspec
index ca0d693f4d..d0da089f28 100644
--- 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
deleted file mode 100644
index 6d37b441fe..0000000000
--- a/test/linked_rails.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'action_pack'
-require 'action_controller'
-require 'action_view'
-
-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)
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3870b30b26..6416a0a59d 100644
--- 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'