aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/addresses_render_test.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-07-04 00:33:56 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-07-04 00:33:56 +0100
commit0a7923ea7a76c1136bddfe638a600c62457df751 (patch)
tree2709c19133af9342958fc51b36ad53ca56c2927a /actionpack/test/controller/addresses_render_test.rb
parent5dba6c024289e42c31894b7d13c1695049fcf30d (diff)
parent1a478923dc909bf7b6aea4f2ad49cbeee6dea259 (diff)
downloadrails-0a7923ea7a76c1136bddfe638a600c62457df751.tar.gz
rails-0a7923ea7a76c1136bddfe638a600c62457df751.tar.bz2
rails-0a7923ea7a76c1136bddfe638a600c62457df751.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/test/controller/addresses_render_test.rb')
-rw-r--r--actionpack/test/controller/addresses_render_test.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index a31734203d..df87182082 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,7 +1,6 @@
require 'abstract_unit'
class Address
-
def Address.count(conditions = nil, join = nil)
nil
end
@@ -20,7 +19,7 @@ class AddressesTestController < ActionController::Base
def self.controller_path; "addresses"; end
end
-AddressesTestController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+AddressesTestController.view_paths = [FIXTURE_LOAD_PATH]
class AddressesTest < Test::Unit::TestCase
def setup