pirj · pirj · Jul 23, 2022 · Jul 23, 2022 · Jul 23, 2022 · Jul 24, 2022
diff --git a/.rspec b/.rspec
@@ -1,2 +1 @@
---colour
 --require 'rails_helper'
diff --git a/Gemfile b/Gemfile
@@ -157,18 +157,22 @@ group :test do
 end
 
 group :test, :development do
-  gem 'rspec'
+  gem 'rspec', github: 'rspec/rspec', branch: '4-0-dev'
+  gem 'rspec-core', github: 'rspec/rspec-core', branch: '4-0-dev'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations', branch: '4-0-dev'
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks', branch: '4-0-dev'
+  gem 'rspec-support', github: 'rspec/rspec-support', branch: '4-0-dev'
   gem 'listen', require: false
   gem 'certified', require: false
   gem 'fabrication', require: false
   gem 'mocha', require: false
 
   gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
 
-  gem 'rspec-rails'
+  gem 'rspec-rails', github: 'pirj/rspec-rails', branch: '4-0-dev-compatible'
 
   gem 'shoulda-matchers', require: false
-  gem 'rspec-html-matchers'
+  gem 'rspec-html-matchers', github: 'pirj/rspec-html-matchers', branch: '4-0-dev-compatible'
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
   gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse'
   gem 'parallel_tests'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,6 +13,72 @@ GIT
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
 
+GIT
+  remote: https://github.com/pirj/rspec-html-matchers.git
+  revision: 5dca76b04390bbdd674a35a7e905d4affc778a1f
+  branch: 4-0-dev-compatible
+  specs:
+    rspec-html-matchers (0.9.4)
+      nokogiri (~> 1)
+      rspec (>= 3.0.0.a, < 5)
+
+GIT
+  remote: https://github.com/pirj/rspec-rails.git
+  revision: df191cba3ba345a2a221321eca6a1c053909ec03
+  branch: 4-0-dev-compatible
+  specs:
+    rspec-rails (6.0.0.pre)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (= 4.0.0.pre)
+      rspec-expectations (= 4.0.0.pre)
+      rspec-mocks (= 4.0.0.pre)
+      rspec-support (= 4.0.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-core.git
+  revision: cdbf3cb38a3d590849196513bed8f20ae562be61
+  branch: 4-0-dev
+  specs:
+    rspec-core (4.0.0.pre)
+      rspec-support (= 4.0.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-expectations.git
+  revision: dd17ec585f71d78ebf0bc3782aef8fd950078393
+  branch: 4-0-dev
+  specs:
+    rspec-expectations (4.0.0.pre)
+      diff-lcs (>= 1.4.4, < 2.0)
+      rspec-support (= 4.0.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-mocks.git
+  revision: 8372ed222207f34328b7be7731cc394dbc52cd40
+  branch: 4-0-dev
+  specs:
+    rspec-mocks (4.0.0.pre)
+      diff-lcs (>= 1.4.4, < 2.0)
+      rspec-support (= 4.0.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-support.git
+  revision: 4f900500a6ceefdb00b0d8460d14be0c909cfd11
+  branch: 4-0-dev
+  specs:
+    rspec-support (4.0.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec.git
+  revision: 1eeb766f1b53f51ab2d15693777348f96628f61c
+  branch: 4-0-dev
+  specs:
+    rspec (4.0.0.pre)
+      rspec-core (= 4.0.0.pre)
+      rspec-expectations (= 4.0.0.pre)
+      rspec-mocks (= 4.0.0.pre)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -388,30 +454,6 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-html-matchers (0.9.4)
-      nokogiri (~> 1)
-      rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.11.0)
     rss (0.2.9)
       rexml
     rswag-specs (2.5.1)
@@ -612,9 +654,13 @@ DEPENDENCIES
   rinku
   rotp
   rqrcode
-  rspec
-  rspec-html-matchers
-  rspec-rails
+  rspec!
+  rspec-core!
+  rspec-expectations!
+  rspec-html-matchers!
+  rspec-mocks!
+  rspec-rails!
+  rspec-support!
   rss
   rswag-specs
   rubocop-discourse!

diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pretty_text'
 
-describe PrettyText do
+RSpec.describe PrettyText do
 
   let(:post) { Fabricate(:post) }
 

diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
@@ -14,7 +14,7 @@ def generate_html(text, opts = {})
   output + "</span></p>"
 end
 
-describe PrettyText do
+RSpec.describe PrettyText do
   before do
     freeze_time
   end

diff --git a/plugins/discourse-local-dates/spec/models/post_spec.rb b/plugins/discourse-local-dates/spec/models/post_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Post do
+RSpec.describe Post do
 
   before do
     Jobs.run_immediately!

diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe DiscourseNarrativeBot::NewUserNarrative do
+RSpec.describe DiscourseNarrativeBot::NewUserNarrative do
   fab!(:welcome_topic) { Fabricate(:topic, title: 'Welcome to Discourse') }
   fab!(:narrative_bot) { ::DiscourseNarrativeBot::Base.new }
   fab!(:discobot_user) { narrative_bot.discobot_user }

diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/store_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/store_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe DiscourseNarrativeBot::Store do
+RSpec.describe DiscourseNarrativeBot::Store do
   describe '.set' do
     it 'should set the right value in the plugin store' do
       key = 'somekey'

diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe DiscourseNarrativeBot::TrackSelector do
+RSpec.describe DiscourseNarrativeBot::TrackSelector do
   let(:user) { Fabricate(:user) }
   let(:narrative_bot) { ::DiscourseNarrativeBot::Base.new }
   let(:discobot_user) { narrative_bot.discobot_user }

diff --git a/plugins/discourse-narrative-bot/spec/jobs/onceoff/remap_old_bot_images_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/onceoff/remap_old_bot_images_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
+RSpec.describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
   context "when bot's post contains an old link" do
     let!(:post) do
       Fabricate(:post,

diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Discobot Certificate" do
+RSpec.describe "Discobot Certificate" do
   let(:user) { Fabricate(:user, name: 'Jeff Atwood') }
 
   let(:params) {

diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Discobot welcome post" do
+RSpec.describe "Discobot welcome post" do
   let(:user) { Fabricate(:user) }
 
   before do

diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe User do
+RSpec.describe User do
   let(:user) { Fabricate(:user) }
   let(:profile_page_url) { "#{Discourse.base_url}/users/#{user.username}" }
 

diff --git a/plugins/discourse-presence/spec/integration/presence_spec.rb b/plugins/discourse-presence/spec/integration/presence_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "discourse-presence" do
+RSpec.describe "discourse-presence" do
   describe 'PresenceChannel configuration' do
     fab!(:user) { Fabricate(:user) }
     fab!(:user2) { Fabricate(:user) }

diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ::DiscoursePoll::PollsController do
+RSpec.describe ::DiscoursePoll::PollsController do
   routes { ::DiscoursePoll::Engine.routes }
 
   let!(:user) { log_in }

diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe PostsController do
+RSpec.describe PostsController do
   let!(:user) { log_in }
   let!(:title) { "Testing Poll Plugin" }
 

diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe "DiscoursePoll endpoints" do
+RSpec.describe "DiscoursePoll endpoints" do
   describe "fetch voters for a poll" do
     fab!(:user) { Fabricate(:user) }
     fab!(:post) { Fabricate(:post, raw: "[poll public=true]\n- A\n- B\n[/poll]") }

diff --git a/plugins/poll/spec/jobs/regular/close_poll_spec.rb b/plugins/poll/spec/jobs/regular/close_poll_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Jobs::ClosePoll do
+RSpec.describe Jobs::ClosePoll do
   let(:post) { Fabricate(:post, raw: "[poll]\n- A\n- B\n[/poll]") }
 
   describe 'missing arguments' do

diff --git a/plugins/poll/spec/lib/new_post_manager_spec.rb b/plugins/poll/spec/lib/new_post_manager_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe NewPostManager do
+RSpec.describe NewPostManager do
   let(:user) { Fabricate(:newuser) }
   let(:admin) { Fabricate(:admin) }
 

diff --git a/plugins/poll/spec/lib/poll_spec.rb b/plugins/poll/spec/lib/poll_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe DiscoursePoll::Poll do
+RSpec.describe DiscoursePoll::Poll do
   fab!(:user) { Fabricate(:user) }
   fab!(:user_2) { Fabricate(:user) }
 

diff --git a/plugins/poll/spec/lib/polls_updater_spec.rb b/plugins/poll/spec/lib/polls_updater_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe DiscoursePoll::PollsUpdater do
+RSpec.describe DiscoursePoll::PollsUpdater do
 
   def update(post, polls)
     DiscoursePoll::PollsUpdater.update(post, polls)

diff --git a/plugins/poll/spec/lib/polls_validator_spec.rb b/plugins/poll/spec/lib/polls_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ::DiscoursePoll::PollsValidator do
+RSpec.describe ::DiscoursePoll::PollsValidator do
   let(:post) { Fabricate(:post) }
   subject { described_class.new(post) }
 

diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe PrettyText do
+RSpec.describe PrettyText do
 
   def n(html)
     html.strip

diff --git a/plugins/poll/spec/models/poll_spec.rb b/plugins/poll/spec/models/poll_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe ::DiscoursePoll::Poll do
+RSpec.describe ::DiscoursePoll::Poll do
   describe ".transform_for_user_field_override" do
     it "Transforms UserField name if a matching CustomUserField is present" do
       user_field_name = "Something Cool"

diff --git a/plugins/poll/spec/requests/users_controller_spec.rb b/plugins/poll/spec/requests/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Admin::UsersController do
+RSpec.describe Admin::UsersController do
 
   let(:admin) { Fabricate(:admin) }
 

diff --git a/plugins/poll/spec/serializers/poll_option_serializer_spec.rb b/plugins/poll/spec/serializers/poll_option_serializer_spec.rb
@@ -8,7 +8,7 @@ def serialize_option(option, user)
   )
 end
 
-describe PollOptionSerializer do
+RSpec.describe PollOptionSerializer do
   let(:voter) { Fabricate(:user) }
   let(:poll) { post.polls.first }
 

diff --git a/plugins/styleguide/spec/integration/access_spec.rb b/plugins/styleguide/spec/integration/access_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'SiteSetting.styleguide_admin_only' do
+RSpec.describe 'SiteSetting.styleguide_admin_only' do
   before do
     SiteSetting.styleguide_enabled = true
   end
@@ -34,7 +34,7 @@
   end
 end
 
-describe 'SiteSetting.styleguide_enabled' do
+RSpec.describe 'SiteSetting.styleguide_enabled' do
   before do
     sign_in(Fabricate(:admin))
   end

diff --git a/plugins/styleguide/spec/integration/assets_spec.rb b/plugins/styleguide/spec/integration/assets_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Styleguide assets' do
+RSpec.describe 'Styleguide assets' do
   before do
     SiteSetting.styleguide_enabled = true
     sign_in(Fabricate(:admin))

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 # frozen_string_literal: true
 
-describe ApplicationHelper do
+RSpec.describe ApplicationHelper do
 
   describe "preload_script" do
     def preload_link(url)

diff --git a/spec/helpers/topics_helper_spec.rb b/spec/helpers/topics_helper_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe TopicsHelper do
+RSpec.describe TopicsHelper do
 
   describe "#categories_breadcrumb" do
     let(:user) { Fabricate(:user) }

diff --git a/spec/helpers/user_notifications_helper_spec.rb b/spec/helpers/user_notifications_helper_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe UserNotificationsHelper do
+RSpec.describe UserNotificationsHelper do
   let(:upload_path) { Discourse.store.upload_path }
 
   describe '#email_excerpt' do