Merge pull request #249 from alphagov/fix_frontend_failures

Upgrade nokogiri and rest-client to appease Synk
alphagov · Feb 28, 2017 · 8f28224 · 8f28224
2 parents 866ce8d + 19924ad
commit 8f28224
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,5 +8,5 @@ gem "cucumber", "1.3.20"
 gem "capybara", "~> 2.12.0"
 gem "poltergeist", "1.13.0"
 
-gem "rest-client", "1.6.7"
-gem "nokogiri", "1.5.5"
+gem "rest-client", "1.8.0"
+gem "nokogiri", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,8 +3,8 @@ GEM
   specs:
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    builder (3.2.2)
-    capybara (2.12.0)
+    builder (3.2.3)
+    capybara (2.12.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -19,13 +19,20 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
     diff-lcs (1.1.3)
+    domain_name (0.5.20170223)
+      unf (>= 0.0.5, < 1.0.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     mime-types (2.99.3)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    nokogiri (1.5.5)
+    netrc (0.11.0)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
     plek (1.11.0)
     poltergeist (1.13.0)
       capybara (~> 2.1)
@@ -36,8 +43,10 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -46,6 +55,9 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -59,11 +71,11 @@ DEPENDENCIES
   capybara (~> 2.12.0)
   cucumber (= 1.3.20)
   minitest (= 5.8.4)
-  nokogiri (= 1.5.5)
+  nokogiri (~> 1.7)
   plek (= 1.11.0)
   poltergeist (= 1.13.0)
   rake (= 0.9.2.2)
-  rest-client (= 1.6.7)
+  rest-client (= 1.8.0)
   rspec (= 2.11.0)
 
 BUNDLED WITH