Mercurial > hg > soundsoftware-site

diff test/integration/.svn/text-base/account_test.rb.svn-base @ 514:7eba09d624db live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents af80e5618e9b
children
line wrap: on
line diff
--- a/test/integration/.svn/text-base/account_test.rb.svn-base	Thu Jul 14 10:46:20 2011 +0100
+++ b/test/integration/.svn/text-base/account_test.rb.svn-base	Thu Jul 14 10:50:53 2011 +0100
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require "#{File.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
 
 begin
   require 'mocha'