Merge pull request #2327 from DataDog/ivoanjo/fix-ci-issue

Avoid using problematic rspec-mocks 3.11.2
DataDog · Oct 25, 2022 · 9e0e9ac · 9e0e9ac
2 parents 1ca2e32 + 99aa6cc
commit 9e0e9ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -29,8 +29,9 @@ end
 gem 'rake', '>= 10.5'
 gem 'rake-compiler', '~> 1.1', '>= 1.1.1' # To compile native extensions
 gem 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'
-gem 'rspec', '~> 3.10'
+gem 'rspec', '~> 3.11'
 gem 'rspec-collection_matchers', '~> 1.1'
+gem 'rspec-mocks', '!= 3.11.2'
 if RUBY_VERSION >= '2.3.0'
   gem 'rspec_junit_formatter', '>= 0.5.1'
 else

diff --git a/integration/apps/rack/Gemfile b/integration/apps/rack/Gemfile
@@ -42,7 +42,8 @@ else
 end
 
 # Development
-gem 'pry-byebug'
+gem 'pry-byebug' if RUBY_VERSION >= '2.3.0' && RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
+gem 'pry-nav' if RUBY_VERSION < '2.3.0'
 # gem 'pry-stack_explorer', platform: :ruby
 # gem 'rbtrace'
 # gem 'ruby-prof'

diff --git a/integration/apps/rack/spec/spec_helper.rb b/integration/apps/rack/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-require 'byebug'
 require 'support/integration_helper'
 
 RSpec.configure do |config|