From 5c0a565e8d5f136c9d668e840decd8f4bd74cbc0 Mon Sep 17 00:00:00 2001
From: rahul <rahulsingh2240@gmail.com>
Date: Sat, 15 Jul 2017 19:59:02 +0530
Subject: [PATCH] webmock updated

Updated Webmock as previous version was not compatible with the new gems
---
 Gemfile.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 928c3b84..8f7ef5d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,7 +57,8 @@ GEM
       awesome_nested_set (>= 2.0)
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
-    addressable (2.3.6)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     ahoy_matey (1.0.0)
       addressable
       browser (>= 0.4.0)
@@ -87,11 +88,8 @@ GEM
     bootstrap3-datetimepicker-rails (3.0.3)
       momentjs-rails (>= 2.8.1)
     browser (0.6.0)
-    byebug (9.0.6)
-
     builder (3.2.3)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
+    byebug (9.0.6)
     cancancan (1.13.1)
     capybara (2.6.2)
       addressable
@@ -140,7 +138,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     currencies (0.4.2)
     daemons (1.1.9)
@@ -220,6 +218,7 @@ GEM
       rake (>= 10, < 13)
       rubocop (>= 0.47.0)
       sysexits (~> 1.1)
+    hashdiff (0.3.4)
     hashie (2.1.1)
     hike (1.2.3)
     hoptoad_notifier (2.4.11)
@@ -355,6 +354,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.5)
     rack (1.6.8)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -410,8 +410,8 @@ GEM
       activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -454,13 +454,13 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -542,9 +542,10 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webmock (1.20.4)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -641,9 +642,8 @@ DEPENDENCIES
   rolify
   rqrcode
   rspec-activemodel-mocks
-
   rspec-rails (~> 3.5, >= 3.5.2)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.49.0)
   ruby-oembed
   sass-rails (>= 4.0.2)
   selectize-rails