vendor/rails/activeresource/test/base/custom_methods_test.rb in radiant-0.6.9 vs vendor/rails/activeresource/test/base/custom_methods_test.rb in radiant-0.7.0

@@ -1,8 +1,8 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-require "#{File.dirname(__FILE__)}/../fixtures/person"
-require "#{File.dirname(__FILE__)}/../fixtures/street_address"
+require 'abstract_unit'
+require 'fixtures/person'
+require 'fixtures/street_address'
 
 class CustomMethodsTest < Test::Unit::TestCase
   def setup
     @matz  = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
     @matz_deep  = { :id => 1, :name => 'Matz', :other => 'other' }.to_xml(:root => 'person')
@@ -30,9 +30,12 @@
       mock.get    "/people/1/addresses/1/deep.xml", {}, @addy_deep
       mock.put    "/people/1/addresses/1/normalize_phone.xml?locale=US", {}, nil, 204
       mock.put    "/people/1/addresses/sort.xml?by=name", {}, nil, 204
       mock.post   "/people/1/addresses/new/link.xml", {}, { :street => '12345 Street' }.to_xml(:root => 'address'), 201, 'Location' => '/people/1/addresses/2.xml'
     end
+
+    Person.user = nil
+    Person.password = nil
   end  
 
   def teardown
     ActiveResource::HttpMock.reset!
   end