Skip to content

Commit

Permalink
Merge pull request #193 from DataDog/anmarchenko/auto_avoid_webmock
Browse files Browse the repository at this point in the history
[SDTEST-202] Ignore Webmock automatically when making HTTP calls
  • Loading branch information
anmarchenko authored Jun 20, 2024
2 parents f6943fb + 56d52e3 commit 842fc1c
Show file tree
Hide file tree
Showing 244 changed files with 3,939 additions and 1,903 deletions.
17 changes: 11 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,39 @@ source "https://rubygems.org"
# Specify your gem's dependencies in datadog-ci.gemspec
gemspec

# dev experience
gem "pry"
gem "rake"
gem "os"
gem "standard", "~> 1.31"

# To compile native extensions
# native extensions
gem "rake-compiler"

# testing
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "webmock"
# platform helpers
gem "os"

gem "standard", "~> 1.31"

# docs and release
gem "yard"
gem "redcarpet" if RUBY_PLATFORM != "java"
gem "webrick"
gem "pimpmychangelog", ">= 0.1.2"

# coverage
gem "simplecov"
gem "simplecov-cobertura", "~> 2.1.0"

# type checking
group :check do
if RUBY_VERSION >= "3.0.0" && RUBY_PLATFORM != "java"
gem "rbs", "~> 3.2.0", require: false
gem "steep", "~> 1.6.0", require: false
gem "rbs", "~> 3.5.0", require: false
gem "steep", "~> 1.7.0", require: false
end
end

Expand Down
1 change: 1 addition & 0 deletions Steepfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ target :lib do
library "selenium-webdriver"
library "capybara"
library "timecop"
library "webmock"
end
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.4_activesupport_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ source "https://rubygems.org"

gem "pry"
gem "rake"
gem "os"
gem "standard", "~> 1.31"
gem "rake-compiler"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "standard", "~> 1.31"
gem "webmock"
gem "os"
gem "yard"
gem "webrick"
gem "pimpmychangelog", ">= 0.1.2"
Expand Down
38 changes: 25 additions & 13 deletions gemfiles/jruby_9.4_activesupport_4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
appraisal (2.5.0)
bundler
rake
Expand All @@ -21,16 +23,20 @@ GEM
bigdecimal (3.1.7-java)
climate_control (1.2.0)
coderay (1.1.3)
concurrent-ruby (1.2.3)
datadog (2.0.0)
concurrent-ruby (1.3.3)
crack (1.0.0)
bigdecimal
rexml
datadog (2.1.0)
debase-ruby_core_source (= 3.3.1)
libdatadog (~> 9.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.3.1)
diff-lcs (1.5.1)
docile (1.4.0)
ffi (1.16.3-java)
ffi (1.17.0-java)
hashdiff (1.1.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.7.2-java)
Expand All @@ -40,26 +46,27 @@ GEM
ffi (~> 1.0)
lint_roller (1.1.0)
method_source (1.1.0)
minitest (5.23.0)
minitest (5.24.0)
msgpack (1.7.2-java)
os (1.1.4)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
pimpmychangelog (0.1.3)
pry (0.14.2-java)
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
public_suffix (5.1.1)
racc (1.8.0-java)
rainbow (3.1.1)
rake (13.2.1)
rake-compiler (1.2.7)
rake
regexp_parser (2.9.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.0)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -68,7 +75,7 @@ GEM
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
Expand All @@ -77,7 +84,7 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.63.5)
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -90,7 +97,7 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
Expand All @@ -105,10 +112,10 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.36.0)
standard (1.37.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.63.0)
rubocop (~> 1.64.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.4)
standard-custom (1.0.2)
Expand All @@ -123,6 +130,10 @@ GEM
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
yard (0.9.36)

Expand All @@ -146,6 +157,7 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
webmock
webrick
yard

Expand Down
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.4_activesupport_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ source "https://rubygems.org"

gem "pry"
gem "rake"
gem "os"
gem "standard", "~> 1.31"
gem "rake-compiler"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "standard", "~> 1.31"
gem "webmock"
gem "os"
gem "yard"
gem "webrick"
gem "pimpmychangelog", ">= 0.1.2"
Expand Down
38 changes: 25 additions & 13 deletions gemfiles/jruby_9.4_activesupport_5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
appraisal (2.5.0)
bundler
rake
Expand All @@ -21,16 +23,20 @@ GEM
bigdecimal (3.1.7-java)
climate_control (1.2.0)
coderay (1.1.3)
concurrent-ruby (1.2.3)
datadog (2.0.0)
concurrent-ruby (1.3.3)
crack (1.0.0)
bigdecimal
rexml
datadog (2.1.0)
debase-ruby_core_source (= 3.3.1)
libdatadog (~> 9.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.3.1)
diff-lcs (1.5.1)
docile (1.4.0)
ffi (1.16.3-java)
ffi (1.17.0-java)
hashdiff (1.1.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.2-java)
Expand All @@ -40,26 +46,27 @@ GEM
ffi (~> 1.0)
lint_roller (1.1.0)
method_source (1.1.0)
minitest (5.23.0)
minitest (5.24.0)
msgpack (1.7.2-java)
os (1.1.4)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
pimpmychangelog (0.1.3)
pry (0.14.2-java)
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
public_suffix (5.1.1)
racc (1.8.0-java)
rainbow (3.1.1)
rake (13.2.1)
rake-compiler (1.2.7)
rake
regexp_parser (2.9.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.0)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -68,7 +75,7 @@ GEM
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
Expand All @@ -77,7 +84,7 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.63.5)
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -90,7 +97,7 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
Expand All @@ -105,10 +112,10 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.36.0)
standard (1.37.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.63.0)
rubocop (~> 1.64.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.4)
standard-custom (1.0.2)
Expand All @@ -123,6 +130,10 @@ GEM
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
yard (0.9.36)

Expand All @@ -146,6 +157,7 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
webmock
webrick
yard

Expand Down
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.4_activesupport_6.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ source "https://rubygems.org"

gem "pry"
gem "rake"
gem "os"
gem "standard", "~> 1.31"
gem "rake-compiler"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "standard", "~> 1.31"
gem "webmock"
gem "os"
gem "yard"
gem "webrick"
gem "pimpmychangelog", ">= 0.1.2"
Expand Down
Loading

0 comments on commit 842fc1c

Please sign in to comment.