Mercurial > hg > soundsoftware-site
diff test/integration/api_test/.svn/text-base/disabled_rest_api_test.rb.svn-base @ 511:107d36338b70 live
Merge from branch "cannam"
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:43:07 +0100 |
parents | af80e5618e9b |
children |
line wrap: on
line diff
--- a/test/integration/api_test/.svn/text-base/disabled_rest_api_test.rb.svn-base Thu Jun 09 16:51:06 2011 +0100 +++ b/test/integration/api_test/.svn/text-base/disabled_rest_api_test.rb.svn-base Thu Jul 14 10:43:07 2011 +0100 @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../test_helper" +require File.expand_path('../../../test_helper', __FILE__) class ApiTest::DisabledRestApiTest < ActionController::IntegrationTest fixtures :all