From 6545a68264682e8d0a0ee0e913fa98d92fef9428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 24 Jan 2010 15:08:06 +0100
Subject: Fix failing tests after merge.

---
 actionpack/lib/action_controller/metal/helpers.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 757ce3c319..0e3db86861 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -111,6 +111,7 @@ module ActionController
           extract  = /^#{Regexp.quote(path)}\/?(.*)_helper.rb$/
           helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
         end
+        helpers.sort!
         helpers.uniq!
         helpers
       end
-- 
cgit v1.2.3