Merge pull request #91 from rusikf/patch-9

refactoring tests

Author: indirect

test/lib/generators/haml/controller_generator_test.rb

@@ -2,16 +2,17 @@
 require 'lib/generators/haml/testing_helper'
 
 class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root)
+  destination Rails.root
   tests Rails::Generators::ControllerGenerator
-  arguments %w(Account foo bar --template-engine haml)
 
   setup :prepare_destination
   setup :copy_routes
 
-  test "should invoke template engine" do
-    run_generator
-    assert_file "app/views/account/foo.html.haml", %r(app/views/account/foo\.html\.haml)
-    assert_file "app/views/account/bar.html.haml", %r(app/views/account/bar\.html\.haml)
-  end
+  arguments %w(Account foo bar --template-engine haml)
+
+  test "should invoke haml engine" do
+    run_generator 
+    assert_file "app/views/account/foo.html.haml"
+    assert_file "app/views/account/bar.html.haml"
+  end 
 end

test/test_helper.rb

@@ -7,26 +7,24 @@
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
 end
-Rails.application = TestApp
 
 module Rails
   def self.root
     @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
   end
 end
-Rails.application.config.root = Rails.root
 
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
-Rails::Generators.configure! Rails.application.config.generators
+Rails.application.load_generators
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 def copy_routes
-  routes = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb'))
+  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), destination
+  FileUtils.cp File.expand_path(routes), File.expand_path(destination)
 end
 
 # Asserts the given class exists in the given content. When a block is given,