Merge pull request #1649 from DataDog/migrate-last-rails

DataDog · Aug 13, 2021 · 8360a8c · 8360a8c
2 parents a160c68 + e65331a
commit 8360a8c
Show file tree

Hide file tree

Showing 18 changed files with 281 additions and 1,169 deletions.
diff --git a/.github/workflows/test-head.yaml b/.github/workflows/test-head.yaml
@@ -17,8 +17,6 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
         continue-on-error: true
-      - run: bundle exec rake test:main
-        continue-on-error: true
       - run: bundle exec rake spec:main
         continue-on-error: true
       - run: bundle exec rake spec:contrib

diff --git a/Gemfile b/Gemfile
@@ -12,9 +12,6 @@ gem 'climate_control', '~> 0.2.0'
 # Leave it open as we also have it as an integration and want Appraisal to control the version under test.
 gem 'concurrent-ruby'
 gem 'memory_profiler', '~> 0.9'
-gem 'minitest', '= 5.10.1'
-gem 'minitest-around', '0.5.0'
-gem 'minitest-stub_any_instance', '1.0.2'
 gem 'os', '~> 1.1'
 gem 'pimpmychangelog', '>= 0.1.2'
 gem 'pry'

diff --git a/Rakefile b/Rakefile
diff --git a/docs/DevelopmentGuide.md b/docs/DevelopmentGuide.md
@@ -42,9 +42,7 @@ Then within this container you can [run tests](#running-tests), or [run code qua
 
 ## Testing
 
-The test suite uses both [Minitest](https://github.com/seattlerb/minitest) and [RSpec](https://rspec.info/) tests to verify the correctness of both the core trace library and its integrations.
-
-Minitest is deprecated in favor of RSpec; all new tests should be written in RSpec, and only existing minitests should be updated.
+The test suite uses [RSpec](https://rspec.info/) tests to verify the correctness of both the core trace library and its integrations.
 
 ### Writing tests
 
@@ -68,9 +66,6 @@ Simplest way to run tests is to run `bundle exec rake ci`, which will run the en
 Run the tests for the core library with:
 
 ```
-# Run Minitest
-$ bundle exec rake test:main
-# Run RSpec
 $ bundle exec rake spec:main
 ```
 

diff --git a/spec/ddtrace/contrib/rails/rack_spec.rb b/spec/ddtrace/contrib/rails/rack_spec.rb
diff --git a/spec/ddtrace/contrib/rails/rails_helper.rb b/spec/ddtrace/contrib/rails/rails_helper.rb
@@ -134,8 +134,8 @@
 # ### Rails application lifecycle ###
 #
 # This implementation of Rails testing works differently than other testing suites.
-# Unlike the Minitest suite in `ddtrace`, it does not create only one Rails application at
-# load time. Instead it dynamically recreates Rails applications per example. This is how
+# It does not create only one Rails application at load time.
+# Instead it dynamically recreates Rails applications per example. This is how
 # it is able to allow specs to define custom middleware and Rails configuration settings.
 #
 # To accomplish this, it uses RSpec's `let` blocks. `let` blocks are lazy variables that are

diff --git a/test/contrib/rails/apps/application.rb b/test/contrib/rails/apps/application.rb
diff --git a/test/contrib/rails/apps/controllers.rb b/test/contrib/rails/apps/controllers.rb
diff --git a/test/contrib/rails/apps/models.rb b/test/contrib/rails/apps/models.rb
diff --git a/test/contrib/rails/apps/rails3.rb b/test/contrib/rails/apps/rails3.rb
diff --git a/test/contrib/rails/apps/rails4.rb b/test/contrib/rails/apps/rails4.rb
diff --git a/test/contrib/rails/apps/rails5.rb b/test/contrib/rails/apps/rails5.rb
diff --git a/test/contrib/rails/apps/rails6.rb b/test/contrib/rails/apps/rails6.rb
diff --git a/test/contrib/rails/apps/routes.rb b/test/contrib/rails/apps/routes.rb
diff --git a/test/contrib/rails/core_extensions.rb b/test/contrib/rails/core_extensions.rb