Merge branch 'master' of github.com:OWASP/railsgoat

Gemfile.lock

@@ -34,7 +34,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.6)
+    bcrypt (3.1.7)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     better_errors (1.1.0)
@@ -78,7 +78,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    cucumber (1.3.10)
+    cucumber (1.3.11)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -102,16 +102,16 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
-    gauntlt (1.0.6)
+    gauntlt (1.0.8)
-      aruba
+      aruba (= 0.5.4)
-      cucumber
+      cucumber (= 1.3.11)
-      nokogiri (~> 1.5.0)
+      nokogiri (= 1.6.1)
-      trollop
+      trollop (~> 2.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    guard (2.4.0)
+    guard (2.5.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.6)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
@@ -122,7 +122,7 @@ GEM
       em-websocket (~> 0.5)
       guard (~> 2.0)
       multi_json (~> 1.8)
-    guard-rspec (4.2.7)
+    guard-rspec (4.2.8)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     guard-shell (0.6.1)
@@ -130,7 +130,7 @@ GEM
     haml (4.0.5)
       tilt
     hashr (0.0.22)
-    highline (1.6.20)
+    highline (1.6.21)
     hike (1.2.3)
     http_parser.rb (0.5.3)
     i18n (0.6.9)
@@ -146,7 +146,7 @@ GEM
     launchy (2.4.2)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
-    listen (2.6.0)
+    listen (2.7.1)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
@@ -167,10 +167,12 @@ GEM
       thin (~> 1.5.0)
     method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.8.4)
+    mini_portile (0.5.2)
+    multi_json (1.9.0)
     multi_test (0.0.3)
     nio4r (1.0.0)
-    nokogiri (1.5.11)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     poltergeist (1.5.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -221,7 +223,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
@@ -238,12 +240,13 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.4.1)
       sexp_processor (~> 4.1)
-    sass (3.2.14)
+    safe_yaml (0.9.7)
+    sass (3.3.3)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sexp_processor (4.4.1)
+    sexp_processor (4.4.2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -259,13 +262,13 @@ GEM
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.4.7)
+    slop (3.5.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     temple (0.6.7)
     terminal-table (1.4.5)
     therubyracer (0.12.1)
@@ -278,14 +281,15 @@ GEM
     thor (0.18.1)
     tilt (1.4.1)
     timers (1.1.0)
-    travis-lint (1.7.0)
+    travis-lint (1.8.0)
       hashr (~> 0.0.22)
+      safe_yaml (~> 0.9.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
-    uglifier (2.4.0)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.2)

spec/support/capybara_shared.rb

@@ -76,7 +76,7 @@ class WarningSuppressor
 end
 
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor)
+  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor, timeout: 60)
 end
 
 Capybara.javascript_driver = :poltergeist