From e41c91b4d4608c0fd224b31a194f74f14490dcf8 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Wed, 8 Jun 2011 14:48:57 -0400
Subject: [PATCH] Avoid error in Rails 3.1 where the application may have
 already been initialized

---
 lib/diesel/testing/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diesel/testing/application.rb b/lib/diesel/testing/application.rb
index 3c8b92f..a98c699 100644
--- a/lib/diesel/testing/application.rb
+++ b/lib/diesel/testing/application.rb
@@ -28,7 +28,7 @@ def require_environment!
 
       def initialize!
         FileUtils.mkdir_p(Rails.root.join("db").to_s)
-        super
+        super unless @initialized
       end
     end
   end