diff --git a/Gemfile b/Gemfile index 4e1ee5de..a030f356 100644 --- a/Gemfile +++ b/Gemfile @@ -61,6 +61,7 @@ group :development, :test do gem 'byebug', platform: :mri gem 'factory_bot_rails' gem 'parallel_tests' + gem 'rspec-rails', '~> 5.1.0' end group :development do @@ -81,7 +82,6 @@ group 'test' do gem 'database_cleaner' gem 'launchy' gem 'rails-controller-testing' - gem 'rspec-rails', '~> 4.1.2' gem 'simplecov', require: false gem 'timecop' end diff --git a/Gemfile.lock b/Gemfile.lock index 8ab58729..59c0f8b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM temple (>= 0.8.0) tilt hashie (5.0.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) io-wait (0.2.1) jbuilder (2.11.5) @@ -245,18 +245,18 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rexml (3.2.5) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (4.1.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) + rspec-rails (5.1.0) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) rspec-core (~> 3.10) rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) @@ -322,7 +322,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS x86_64-darwin-20 @@ -355,7 +355,7 @@ DEPENDENCIES puma (>= 5.5.2) rails (~> 7.0.1) rails-controller-testing - rspec-rails (~> 4.1.2) + rspec-rails (~> 5.1.0) rubocop seed_dump simplecov diff --git a/Rakefile b/Rakefile index 0df4c58b..c0fc9e61 100644 --- a/Rakefile +++ b/Rakefile @@ -3,13 +3,3 @@ require_relative 'config/application' Rails.application.load_tasks - -begin - require 'rspec/core/rake_task' - RSpec::Core::RakeTask.new(:spec) - - task(:default).clear - task default: :spec -rescue LoadError => e - raise e unless ENV['RAILS_ENV'] == 'production' -end