From 4dd4e86dac644cf877ec197bea7dc666f53c020b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 30 Oct 2020 02:57:48 +0100
Subject: [PATCH 1/2] Update Rubocop to version 1.x

---
 .gitignore                |  2 --
 rubocop-discourse.gemspec |  4 ++--
 rubocop-rspec.yml         | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0059c11..b844b14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-.rubocop-http*
 Gemfile.lock
-.byebug_history
diff --git a/rubocop-discourse.gemspec b/rubocop-discourse.gemspec
index 403946b..5846139 100644
--- a/rubocop-discourse.gemspec
+++ b/rubocop-discourse.gemspec
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rubocop", ">= 0.69.0"
-  s.add_runtime_dependency "rubocop-rspec", ">= 1.39.0"
+  s.add_runtime_dependency "rubocop", ">= 1.1.0"
+  s.add_runtime_dependency "rubocop-rspec", ">= 2.0.0.pre"
 
   s.add_development_dependency "rake", "~> 13.0"
   s.add_development_dependency "rspec"
diff --git a/rubocop-rspec.yml b/rubocop-rspec.yml
index 8d973e3..ee5b440 100644
--- a/rubocop-rspec.yml
+++ b/rubocop-rspec.yml
@@ -192,20 +192,20 @@ RSpec/VoidExpect:
 RSpec/Yield:
   Enabled: true
 
-Capybara/CurrentPathExpectation:
+RSpec/Capybara/CurrentPathExpectation:
   Enabled: true
 
-Capybara/FeatureMethods:
+RSpec/Capybara/FeatureMethods:
   Enabled: true
 
-FactoryBot/AttributeDefinedStatically:
+RSpec/FactoryBot/AttributeDefinedStatically:
   Enabled: true
 
-FactoryBot/CreateList:
+RSpec/FactoryBot/CreateList:
   Enabled: true
 
-FactoryBot/FactoryClassName:
+RSpec/FactoryBot/FactoryClassName:
   Enabled: true
 
-Rails/HttpStatus:
+RSpec/Rails/HttpStatus:
   Enabled: true

From dd7d81dd3292aba7d585546e6af04f5bf75ac5b0 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 30 Oct 2020 03:14:08 +0100
Subject: [PATCH 2/2] Bump version to 2.4.0

---
 rubocop-discourse.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rubocop-discourse.gemspec b/rubocop-discourse.gemspec
index 5846139..c299bff 100644
--- a/rubocop-discourse.gemspec
+++ b/rubocop-discourse.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "rubocop-discourse"
-  s.version     = "2.3.2"
+  s.version     = "2.4.0"
   s.summary     = "Custom rubocop cops used by Discourse"
   s.authors     = ["David Taylor"]
   s.license     = "MIT"