Fix an error for RSpecRails/HttpStatus

Fix: #9
rubocop · Mar 29, 2024 · e09d445 · e09d445
1 parent b141576
commit e09d445
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Master (Unreleased)
 
+- Fix an error for `RSpecRails/HttpStatus`. ([@ydah])
+
 ## 2.28.1 (2024-03-29)
 
 - Implicit dependency on RuboCop RSpec. Note that if you use rubocop-rspec_rails, you must also explicitly add rubocop-rspec to the Gemfile, because you are changing to an implicit dependency on RuboCop RSpec. ([@ydah])

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,6 @@ gemspec
 
 gem 'bump'
 gem 'danger'
-gem 'rack'
 gem 'rake'
 gem 'rspec', '~> 3.11'
 gem 'rubocop-performance', '~> 1.7'

diff --git a/lib/rubocop-rspec_rails.rb b/lib/rubocop-rspec_rails.rb
@@ -4,10 +4,14 @@
 require 'yaml'
 
 require 'rubocop'
-require 'rubocop-rspec'
+
+require 'rubocop/rspec/language/node_pattern'
+
+require 'rubocop/rspec/language'
 
 require_relative 'rubocop/rspec_rails/version'
 
+require 'rubocop/cop/rspec/base'
 require_relative 'rubocop/cop/rspec_rails_cops'
 
 project_root = File.join(__dir__, '..')

diff --git a/lib/rubocop/cop/rspec_rails_cops.rb b/lib/rubocop/cop/rspec_rails_cops.rb
@@ -2,12 +2,8 @@
 
 require_relative 'rspec_rails/avoid_setup_hook'
 require_relative 'rspec_rails/have_http_status'
-require_relative 'rspec_rails/negation_be_valid'
-begin
-  require_relative 'rspec_rails/http_status'
-rescue LoadError
-  # RSpecRails/HttpStatus cannot be loaded if rack/utils is unavailable.
-end
+require_relative 'rspec_rails/http_status'
 require_relative 'rspec_rails/inferred_spec_type'
 require_relative 'rspec_rails/minitest_assertions'
+require_relative 'rspec_rails/negation_be_valid'
 require_relative 'rspec_rails/travel_around'
diff --git a/rubocop-rspec_rails.gemspec b/rubocop-rspec_rails.gemspec
@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
     'rubygems_mfa_required' => 'true'
   }
 
+  spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'rubocop', '~> 1.40'
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -50,4 +50,5 @@ module SpecHelper
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'rubocop-rspec'
 require 'rubocop-rspec_rails'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,4 +50,5 @@ module SpecHelper

		$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

		require 'rubocop-rspec'
		require 'rubocop-rspec_rails'