Merge branch 'warbler' into trinidad

Conflicts:
	Gemfile.lock

Gemfile

@@ -45,6 +45,7 @@ group :test do
   gem 'selenium-client', :require => 'selenium/client'
   gem 'selenium-webdriver'
   gem 'headless'
+  gem 'minitest'
 end
 
 # START:production
@@ -70,4 +71,4 @@ gem "trinidad_scheduler_extension"
 # END:trinidad_scheduler_extension
 # START:trinidad_resque_extension
 gem "trinidad_resque_extension"
-# END:trinidad_resque_extension
+# END:trinidad_resque_extension

Gemfile.lock

@@ -31,11 +31,11 @@ GEM
     activesupport (3.1.1)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    ansi (1.3.0)
+    ansi (1.4.1)
     arel (2.2.1)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
-    capybara (1.1.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -50,19 +50,19 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
-    cucumber (1.1.0)
+    coffee-script-source (1.1.3)
+    cucumber (1.1.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      gherkin (~> 2.6.2)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.1.1)
+    cucumber-rails (1.2.0)
       capybara (>= 1.1.1)
-      cucumber (>= 1.1.0)
+      cucumber (>= 1.1.1)
       nokogiri (>= 1.5.0)
     daemons (1.1.4)
-    database_cleaner (0.6.7)
+    database_cleaner (0.7.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     eventmachine (0.12.10-java)
@@ -74,9 +74,9 @@ GEM
       rack (>= 1.1.0, < 2)
     faraday_middleware (0.7.0)
       faraday (~> 0.7.3)
-    ffi (1.0.9-java)
+    ffi (1.0.11-java)
     get_back (0.0.1-java)
-    gherkin (2.5.4-java)
+    gherkin (2.6.5-java)
       json (>= 1.4.6)
     hashie (1.1.0)
     headless (0.2.2)
@@ -85,32 +85,33 @@ GEM
     i18n (0.6.0)
     jdbc-postgres (9.0.801)
     jdbc-sqlite3 (3.7.2)
-    jquery-rails (1.0.16)
+    jquery-rails (1.0.17)
       railties (~> 3.0)
       thor (~> 0.14)
-    jruby-jars (1.6.4)
+    jruby-jars (1.6.5)
     jruby-lint (0.3.0)
       jruby-openssl
       nokogiri (>= 1.5.0.beta.4)
       term-ansicolor
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    jruby-rack (1.0.10)
+    jruby-rack (1.1.1)
     json (1.6.1-java)
     json_pure (1.6.1)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
+    minitest (2.8.1)
     multi_json (1.0.3)
     multi_xml (0.4.1)
     multipart-post (1.1.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.4)
+    net-ssh (2.2.1)
     nokogiri (1.5.0-java)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -163,16 +164,15 @@ GEM
       rspec (~> 2.7.0)
     rubyzip (0.9.4)
     sass (3.1.10)
-    sass-rails (3.1.4)
+    sass-rails (3.1.5)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
-      sass (>= 3.1.4)
-      sprockets (~> 2.0.0)
+      sass (~> 3.1.10)
       tilt (~> 1.3.2)
     selenium-client (1.2.18)
-    selenium-webdriver (2.9.1)
+    selenium-webdriver (2.13.0)
       childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
+      ffi (~> 1.0.9)
       json_pure
       rubyzip
     simple_oauth (0.1.5)
@@ -219,8 +219,8 @@ GEM
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)
       simple_oauth (~> 0.1.4)
-    tzinfo (0.3.30)
-    uglifier (1.0.4)
+    tzinfo (0.3.31)
+    uglifier (1.1.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     vegas (0.1.8)
@@ -250,6 +250,7 @@ DEPENDENCIES
   jquery-rails
   jruby-openssl
   json
+  minitest
   net-scp
   net-ssh
   rails (= 3.1.1)