Mercurial > hg > soundsoftware-site

diff test/functional/news_controller_test.rb @ 511:107d36338b70 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents af80e5618e9b
children cbb26bc654de
line wrap: on
line diff
--- a/test/functional/news_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/news_controller_test.rb	Thu Jul 14 10:43:07 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__)
 require 'news_controller'
 
 # Re-raise errors caught by the controller.