From 703fecb4fc81c3a975a53c9c4534f40193bd1ab9 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 24 Nov 2008 11:37:57 -0600
Subject: Add LAZY env flag for testing autoload/lazy load feature

---
 actionpack/lib/action_controller.rb | 2 +-
 actionpack/lib/action_view.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8b4819bf65..08e6f4efa8 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -101,4 +101,4 @@ autoload :Mime, 'action_controller/mime_type'
 autoload :HTML, 'action_controller/vendor/html-scanner'
 autoload :Rack, 'action_controller/vendor/rack'
 
-ActionController.load_all!
+ActionController.load_all! unless ENV['LAZY']
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 0c76204060..436bce4a69 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -56,4 +56,4 @@ end
 
 I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
 
-ActionView.load_all!
+ActionView.load_all! unless ENV['LAZY']
-- 
cgit v1.2.3