Try fixing Haml for edge Rails; refactored ActionPack loading in tests

mislav · Mar 6, 2008 · d422d31 · d422d31
1 parent 2916fff
commit d422d31
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/lib/haml/template/plugin.rb b/lib/haml/template/plugin.rb
@@ -39,5 +39,9 @@ def read_template_file(template_path, extension)
   end
 end
 
-ActionView::Base.register_template_handler(:haml, Haml::Template)
+if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler
+  ActionView::Template
+else
+  ActionView::Base
+end.register_template_handler(:haml, Haml::Template)
 # :startdoc:
diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
@@ -1,13 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
-require 'haml/engine'
+require File.dirname(__FILE__) + '/test_helper'
 
 class EngineTest < Test::Unit::TestCase
 

diff --git a/test/haml/helper_test.rb b/test/haml/helper_test.rb
@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/test_helper'
 require 'haml/template'
 
 class HelperTest < Test::Unit::TestCase

diff --git a/test/haml/runner.rb b/test/haml/runner.rb
@@ -1,8 +1,5 @@
-require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-require '../../lib/haml/template'
+require File.dirname(__FILE__) + '/test_helper'
+require 'haml/template'
 require 'fileutils'
 
 haml_template_engine = Haml::Template.new(ActionView::Base.new)

diff --git a/test/haml/template_test.rb b/test/haml/template_test.rb
@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require 'rubygems'
-require 'action_pack'
-require 'action_controller'
-require 'active_support'
-require 'action_view'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/test_helper'
 require 'haml/template'
 require File.dirname(__FILE__) + '/mocks/article'
 

diff --git a/test/haml/test_helper.rb b/test/haml/test_helper.rb
@@ -0,0 +1,15 @@
+# allows testing with edge Rails by creating a test/rails symlink
+vendored_rails = File.dirname(__FILE__) + '/../rails'
+
+if File.exists? vendored_rails
+  puts "[ using vendored Rails ]"
+  $:.unshift vendored_rails + '/activesupport/lib'
+  $:.unshift vendored_rails + '/actionpack/lib'
+else
+  require 'rubygems'
+end
+require 'action_controller'
+require 'action_view'
+
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/haml'