summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
-rw-r--r--spec/spec_helper.rb2
-rw-r--r--spec/support/webmock.rb3
4 files changed, 10 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 9ff7392..0321760 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,5 +6,5 @@ group :development, :test do
gem 'rubocop', '0.49.1', require: false
gem 'simplecov', '~> 0.9.0', require: false
gem 'vcr', '~> 4.0.0'
- gem 'webmock', '~> 1.9.0'
+ gem 'webmock', '~> 3.4.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index bc9f090..eb6dfea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,13 +8,14 @@ GEM
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
docile (1.1.5)
+ hashdiff (0.3.7)
listen (0.5.3)
multi_json (1.13.1)
parallel (1.12.1)
parser (2.5.1.2)
ast (~> 2.4.0)
powerpack (0.1.2)
- public_suffix (3.0.2)
+ public_suffix (3.0.3)
rainbow (2.2.2)
rake
rake (12.3.1)
@@ -47,9 +48,10 @@ GEM
simplecov-html (0.9.0)
unicode-display_width (1.4.0)
vcr (4.0.0)
- webmock (1.9.3)
- addressable (>= 2.2.7)
+ webmock (3.4.2)
+ addressable (>= 2.3.6)
crack (>= 0.3.2)
+ hashdiff
PLATFORMS
ruby
@@ -60,7 +62,7 @@ DEPENDENCIES
rubocop (= 0.49.1)
simplecov (~> 0.9.0)
vcr (~> 4.0.0)
- webmock (~> 1.9.0)
+ webmock (~> 3.4.0)
BUNDLED WITH
1.16.3
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5defedf..4a9c15e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,6 @@
require 'simplecov'
SimpleCov.start
-require 'webmock'
-
require 'gitlab_init'
Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb
new file mode 100644
index 0000000..ed4fe6d
--- /dev/null
+++ b/spec/support/webmock.rb
@@ -0,0 +1,3 @@
+require 'webmock/rspec'
+
+WebMock.disable_net_connect!(allow_localhost: true)