X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..0b24e77812c03adc6e7497bd6d01d1dadbeeed1a:/test/test_helper.rb?ds=sidebyside

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8c270c682..c210315a9 100644
--- 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'
 
-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
@@ -122,6 +122,23 @@ class Test::Unit::TestCase
   def content(c)
     @request.env["RAW_POST_DATA"] = c.to_s
   end
-
+  
+  def set_locale(l)
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = l.to_s
+  end
+  
+  # Used to check that the error header and the forbidden responses are given
+  # when the owner of the changset has their data not marked as public
+  def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
+    assert_response :forbidden, msg
+    assert_equal @response.headers['Error'], "You must make your edits public to upload new data", "Wrong error message"
+  end
+  
+  # Not sure this is the best response we could give
+  def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
+    assert_response :unauthorized, msg
+    #assert_equal @response.headers['Error'], ""
+  end
+  
   # Add more helper methods to be used by all tests here...
 end