test/test_helper.rb in haml-rails-2.0.1 vs test/test_helper.rb in haml-rails-2.1.0

@@ -1,77 +1,45 @@
 require 'rubygems'
 require 'minitest/autorun'
-require 'rails/all'
+require 'action_pack'
+require 'action_controller'
+require 'action_view'
+require 'rails'
 require 'rails/generators'
 require 'rails/generators/test_case'
+Bundler.require(:default)
 
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
+  config.eager_load = false
 end
 
 module Rails
   def self.root
-    @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
+    @root ||= Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails')))
   end
 end
 
-# Call configure to load the settings from
-# Rails.application.config.generators to Rails::Generators
-Rails.application.load_generators
+TestApp.initialize!
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-def copy_routes
-  routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
-  destination = File.join(Rails.root, "config")
-  FileUtils.mkdir_p(destination)
-  FileUtils.cp File.expand_path(routes), File.expand_path(destination)
-end
+module Haml
+  module Rails
+    module GeneratorTestHelpers
+      private
 
-# Asserts the given class exists in the given content. When a block is given,
-# it yields the content of the class.
-#
-#   assert_file "test/functional/accounts_controller_test.rb" do |controller_test|
-#     assert_class "AccountsControllerTest", controller_test do |klass|
-#       assert_match /context "index action"/, klass
-#     end
-#   end
-#
-def assert_class(klass, content)
-  assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
-  yield $2.strip if block_given?
-end
-
-def generator_list
-  {
-    :rails        => ['scaffold', 'controller', 'mailer'],
-    :haml         => ['scaffold', 'controller', 'mailer']
-  }
-end
-
-def path_prefix(name)
-  case name
-  when :rails
-    'rails/generators'
-  else
-    'generators'
-  end
-end
-
-def require_generators(generator_list)
-  generator_list.each do |name, generators|
-    generators.each do |generator_name|
-      if name.to_s == 'rails' && generator_name.to_s == 'mailer'
-        require File.join(path_prefix(name), generator_name.to_s, "#{generator_name}_generator")
-      else
-        require File.join(path_prefix(name), name.to_s, generator_name.to_s, "#{generator_name}_generator")
+      def copy_routes
+        routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
+        destination = File.join(::Rails.root, "config")
+        FileUtils.mkdir_p(destination)
+        FileUtils.cp File.expand_path(routes), File.expand_path(destination)
       end
     end
   end
 end
-alias :require_generator :require_generators
 
-require_generators generator_list
+::Rails::Generators::TestCase.include Haml::Rails::GeneratorTestHelpers
 
 # Remove tmp directory when test suite is completed
 MiniTest.after_run do
   tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
   FileUtils.rm_r(tmp_dir)