Merge 16743:16811 from trunk.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5dd319e02a05e1d1a40391b40f18f8b62b8febfc..4972ee6d6e6b90b1d7fb14c8f2e54ed687fdf9e0 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 load 'composite_primary_keys/fixtures.rb'
 
 require 'test_help'
 load 'composite_primary_keys/fixtures.rb'
 

-class Test::Unit::TestCase
+class ActiveSupport::TestCase

   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded


@@ -71,6 +71,8 @@ class Test::Unit::TestCase
     set_fixture_class :gpx_files => 'Trace'
     set_fixture_class :gps_points => 'Tracepoint'
     set_fixture_class :gpx_file_tags => 'Tracetag'
     set_fixture_class :gpx_files => 'Trace'
     set_fixture_class :gps_points => 'Tracepoint'
     set_fixture_class :gpx_file_tags => 'Tracetag'

+
+    fixtures :client_applications

   end
 
   ##
   end
 
   ##


@@ -136,5 +138,9 @@ class Test::Unit::TestCase
     #assert_equal @response.headers['Error'], ""
   end
   
     #assert_equal @response.headers['Error'], ""
   end
   

+  def assert_no_missing_translations(msg="")
+    assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
+  end
+  

   # Add more helper methods to be used by all tests here...
 end
   # Add more helper methods to be used by all tests here...
 end