return aruba to Gemfile and fix aruba scenarios

features/make_project_from_template.feature

@@ -14,7 +14,7 @@ Feature: Create project from template
     And I have logged in as "testuser" with password "secret"
     And I have a context called "Context A"
   
-  @javascript @announce @wip
+  @javascript @aruba 
   Scenario: Create a project with one task
     Given a template that looks like
       """
@@ -25,7 +25,7 @@ Feature: Create project from template
     Then I should have a project called "My first project"
     And I should have 1 todo in project "My first project"
     
-  @javascript @wip
+  @javascript @aruba 
   Scenario: Create a project with dependent tasks
     Given a template that looks like
       """

features/step_definitions/template_steps.rb

@@ -11,14 +11,14 @@ When /^I execute the script$/ do
   step "I cd to \"../..\""
   
   context_id = @current_user.contexts.first.id
-  port = Capybara.current_session.driver.rack_server.port
+  port = Capybara.current_session.server.port
   
   # assumes there is a context with id=1
   cli = "ruby doc/tracks_template_cli.rb -c #{context_id} -f tmp/aruba/template.txt"
   
   set_env('GTD_LOGIN','testuser')
   set_env('GTD_PASSWORD', 'secret')
-  set_env('GTD_TODOS_URL', 'http://localhost:#{port}/todos.xml')
+  set_env('GTD_TODOS_URL', "http://localhost:#{port}/todos.xml")
   set_env('GTD_PROJECTS_URL', "http://localhost:#{port}/projects.xml")
   set_env('GTD_CONTEXT_URL_PREFIX', "http://localhost:#{port}/contexts/")
   set_env("GTD_CONTEXT_URL","http://localhost:#{port}/contexts.xml")

features/support/env.rb

@@ -7,6 +7,7 @@ require 'simplecov'
 SimpleCov.start 'rails'
 
 require 'cucumber/rails'
+require 'aruba/cucumber'
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd

features/support/hooks.rb

@@ -2,3 +2,8 @@ AfterStep('@pause') do
   print "Press Return to continue..."
   STDIN.getc
 end
+
+Before('@aruba') do
+	@aruba_timeout_seconds = 5
+	# print "\nsetting timeout for aruba to #{@aruba_timeout_seconds}\n"
+end