Start the rots server if it isn't already running

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index bc4ccc97b9b0f7fc26dc5aacae3b4f16541bc4ea..880fcb30aa2c8da23cff403c4c9792e41a3029b8 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -3,6 +3,33 @@ require File.dirname(__FILE__) + '/../test_helper'
 class UserCreationTest < ActionController::IntegrationTest
   fixtures :users
 
 class UserCreationTest < ActionController::IntegrationTest
   fixtures :users
 

+  def setup
+    begin
+      # Test if the ROTS (Ruby OpenID Test Server) is already running
+      rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+    rescue
+      # It isn't, so start a new instance.
+      IO.popen(RAILS_ROOT + "/vendor/gems/rots-0.2.1/bin/rots --silent")
+
+      # Wait for up to 30 seconds for the server to start and respond before continuing
+      for i in (1 .. 30)
+       begin
+         sleep 1
+         rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+         # If the rescue block doesn't fire, ROTS is up and running and we can continue
+         break
+       rescue
+         # If the connection failed, do nothing and repeat the loop
+       end
+      end
+    end
+  end
+
+  def teardown
+    #TODO: The ROTS server needs closing down again at some point,
+    #      but we don't want to do it after every individual test
+  end
+

   def test_create_user_form
     I18n.available_locales.each do |locale|
       get '/user/new', {}, {"accept_language" => locale.to_s}
   def test_create_user_form
     I18n.available_locales.each do |locale|
       get '/user/new', {}, {"accept_language" => locale.to_s}