<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,10 +1,8 @@
 require 'test/unit'
 require 'rubygems'
 
-%w(actionpack activesupport actionmailer).each{ |gem_lib| gem gem_lib, '2.2.2' }
-%w( activesupport actionpack actionmailer action_controller action_controller/test_case 
-    action_controller/test_process action_controller/assertions 
-  ).each{ |lib| require lib }
+%w(actionpack activesupport actionmailer).each{ |gem_lib| gem gem_lib, '2.3.2' }
+%w(activesupport actionpack actionmailer action_controller).each{ |lib| require lib }
 
 plugin_root = File.join(File.dirname(__FILE__), '..')
 require &quot;#{plugin_root}/lib/translate_routes&quot;
@@ -12,11 +10,14 @@ RAILS_ROOT = plugin_root
 
 class PeopleController &lt; ActionController::Base;  end
 
-class TranslateRoutesTest &lt; Test::Unit::TestCase
+class TranslateRoutesTest &lt; ActionController::TestCase
+
+  include ActionController::Assertions::RoutingAssertions
 
   def setup
     @controller = ActionController::Base.new
     @view = ActionView::Base.new
+    ActionController::Routing::Routes.clear!
   end
 
 
@@ -30,12 +31,12 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
   end
-
+  
   def test_unnamed_root_route_with_prefix
     ActionController::Routing::Routes.draw { |map| map.connect '/', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', true)
     ActionController::Routing::Translator.translate_from_file 'test', 'locales', 'routes.yml'
-
+  
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index'
     assert_routing '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
@@ -57,7 +58,7 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
   
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'    
   end
-
+    
   def test_unnamed_translated_route_on_non_default_locale_with_prefix
     ActionController::Routing::Routes.draw { |map| map.connect 'people', :controller =&gt; 'people', :action =&gt; 'index' }
     config_default_locale_settings('en', true)
@@ -66,10 +67,10 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'    
   end
-
-
+  
+  
   # Unnamed routes without prefix on default locale:
-
+  
   def test_unnamed_empty_route_without_prefix
     ActionController::Routing::Routes.draw { |map| map.connect '', :controller =&gt; 'people', :action =&gt; 'index' }
     config_default_locale_settings('en', false)
@@ -78,12 +79,12 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
   end
-
+  
   def test_unnamed_root_route_without_prefix
     ActionController::Routing::Routes.draw { |map| map.connect '/', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', false)
     ActionController::Routing::Translator.translate_from_file 'test', 'locales', 'routes.yml'
-
+  
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_unrecognized_route '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
@@ -102,38 +103,38 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', false)
     ActionController::Routing::Translator.translate { |t| t['en'] = {}; t['es'] = {'people' =&gt; 'gente'} }
-
+  
     assert_routing '/en/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_routing 'gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
   end
-
+  
   def test_unnamed_translated_route_on_non_default_locale_without_prefix
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('en', false)
     ActionController::Routing::Translator.translate { |t| t['en'] = {}; t['es'] = {'people' =&gt; 'gente'} }
-
+  
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
   end
-
-
+  
+  
   # Named routes with prefix on default locale:
-
+  
   def test_named_empty_route_with_prefix
     ActionController::Routing::Routes.draw { |map| map.people '', :controller =&gt; 'people', :action =&gt; 'index' }
     config_default_locale_settings('en', true)
     ActionController::Routing::Translator.translate { |t| t['en'] = {}; t['es'] = {'people' =&gt; 'gente'} }
-
+  
     assert_routing '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_helpers_include :people_en, :people_es, :people
   end
-
+  
   def test_named_root_route_with_prefix
     ActionController::Routing::Routes.draw { |map| map.root :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', true)
     ActionController::Routing::Translator.translate_from_file 'test', 'locales', 'routes.yml'
-
+  
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index'
     assert_routing '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
@@ -153,12 +154,12 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', true)
     ActionController::Routing::Translator.translate { |t| t['en'] = {}; t['es'] = {'people' =&gt; 'gente'} }
-
+  
     assert_routing '/en/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_en, :people_es, :people
   end
-
+  
   def test_named_translated_route_on_non_default_locale_with_prefix
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index' }
     config_default_locale_settings('en', true)
@@ -170,32 +171,32 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
   end
   
   # Named routes without prefix on default locale:
-
+  
   def test_named_empty_route_without_prefix
     ActionController::Routing::Routes.draw { |map| map.people '', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', false)
     ActionController::Routing::Translator.translate { |t|  t['es'] = {};  t['en'] = {'people' =&gt; 'gente'}; }
-
+  
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
   end
-
+  
   def test_named_root_route_without_prefix
     ActionController::Routing::Routes.draw { |map| map.root :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', false)
     ActionController::Routing::Translator.translate_from_file 'test', 'locales', 'routes.yml'
-
+  
     assert_routing '/', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_routing '/en', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_unrecognized_route '/es', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
   end
-
+  
   def test_named_untranslated_route_without_prefix
     ActionController::Routing::Routes.draw { |map| map.people 'foo', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('es', false)
     ActionController::Routing::Translator.translate { |t| t['en'] = {}; t['es'] = {'people' =&gt; 'gente'} }
-
+  
     assert_routing '/en/foo', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_routing 'foo', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_en, :people_es, :people
@@ -210,7 +211,7 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing 'gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_en, :people_es, :people
   end
-
+  
   def test_named_translated_route_on_non_default_locale_without_prefix
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('en', false)
@@ -220,7 +221,7 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_en, :people_es, :people
   end
-
+  
   def test_languages_load_from_file
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('en', false)
@@ -241,39 +242,39 @@ class TranslateRoutesTest &lt; Test::Unit::TestCase
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_fr, :people_en, :people_es, :people
   end
-
+  
   def test_i18n_based_translations_setting_locales
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('en', false)
     I18n.backend = StubbedI18nBackend
     ActionController::Routing::Translator.i18n('es')
-
+  
     assert_routing '/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'    
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_en, :people_es, :people
   end
-
+  
   def test_i18n_based_translations_taking_i18n_available_locales
     ActionController::Routing::Routes.draw { |map| map.people 'people', :controller =&gt; 'people', :action =&gt; 'index'}
     config_default_locale_settings('en', false)
     I18n.stubs(:available_locales).at_least_once.returns StubbedI18nBackend.available_locales
     I18n.backend = StubbedI18nBackend
     ActionController::Routing::Translator.i18n
-
+  
     assert_routing '/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'en'
     assert_routing '/fr/people', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'fr'
     assert_routing '/es/gente', :controller =&gt; 'people', :action =&gt; 'index', :locale =&gt; 'es'
     assert_helpers_include :people_fr, :people_en, :people_es, :people
   end
-
+  
   def test_action_controller_gets_locale_setter
     ActionController::Base.instance_methods.include?('set_locale_from_url')
   end
-
+  
   def test_action_controller_gets_locale_suffix_helper
     ActionController::Base.instance_methods.include?('locale_suffix')
   end
-
+  
   def test_action_view_gets_locale_suffix_helper
     ActionView::Base.instance_methods.include?('locale_suffix')
   end</diff>
      <filename>test/translate_routes_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>c24bddffc3ed3c3fcadbaffa4968e31c08eb3454</id>
    </parent>
  </parents>
  <author>
    <name>Raul Murciano</name>
    <email>raul@murciano.net</email>
  </author>
  <url>http://github.com/raul/translate_routes/commit/53210b040e32d55f31be210bfd501b836b6b6961</url>
  <id>53210b040e32d55f31be210bfd501b836b6b6961</id>
  <committed-date>2009-04-12T11:25:56-07:00</committed-date>
  <authored-date>2009-04-12T11:25:56-07:00</authored-date>
  <message>Tests fixed: required gems/libs + clean routes on setup</message>
  <tree>4eb73c41219f3df972b3cecbf1315e638a062b97</tree>
  <committer>
    <name>Raul Murciano</name>
    <email>raul@murciano.net</email>
  </committer>
</commit>
