Add RSpec 4 compatibility #17652

pirj · 2022-07-25T19:51:37Z

You may check a PR that also switches to use RSpec 4 and RSpec-Rails 6: pirj#1

There are a few reasons it doesn't make sense to switch right away:

RSpec 4 and RSpec-Rails 6 are not yet released, and it's a hassle to source them from GitHub
RSpec-Rails 6 is not marked to support RSpec 4
~~rspec-html-matchers won't work until this PR is merged~~ - fixed in 0.10.0
61 plugins need to be updated (example PR)

What's Done

Comply to strict predicate matchers

See:

Basically,

expect(OpenStruct.new(foo?: nil)).to_not be_foo

won't pass anymore, as strict predicate matchers would only accept true/false, but not "truthy" or "falsey" values.

Use the non-globally exposed RSpec syntax

See rspec/rspec-core#2803

describe/shared_examples won't work without the explicit RSpec..
should/should_not were deprecate nearly a decade ago and will be removed.

Misc

Discourse specs use defaults, and it helped a lot, there's just --color option that had to be removed from .rspec file.
rspec/rspec-core@0407831

RSpec-Rails 6

No changes turned out to be necessary.

CLAassistant · 2022-07-25T19:51:45Z

All committers have signed the CLA.

pirj · 2022-07-25T19:55:44Z

spec/lib/svg_sprite/svg_sprite_spec.rb

@@ -254,7 +254,7 @@
      theme.set_field(target: :common, name: SvgSprite.theme_sprite_variable_name, upload_id: upload.id, type: :theme_upload_var)
      theme.save!

-      expect(Upload.where(id: upload.id)).to be_exist
+      expect(Upload.where(id: upload.id)).to be_exists


Because Upload.where(...).exist? method doesn't exist, but exists? does.

spec/lib/svg_sprite/svg_sprite_spec.rb

spec/models/topic_spec.rb

tgxworld · 2022-07-26T08:26:55Z

Thank you @pirj, some comments but otherwise the PR looks good 👍

pirj · 2022-07-26T09:34:23Z

Thanks for the quick review, @tgxworld . Do you want me to squash the last commit?

tgxworld · 2022-07-27T03:43:39Z

Don't worry about squashing because we'll do a squash and merge once the PR is ready.

rspec/rspec-core@0407831

rspec/rspec-core#2803

See: - rspec/rspec-expectations#1195 - rspec/rspec-expectations#1196 - rspec/rspec-expectations#1277

pirj · 2022-07-27T20:21:40Z

the PR is ready

Is there something I can do to help making it ready?

tgxworld · 2022-07-28T02:27:53Z

@pirj Thank you for your contribution here 👍

pirj commented Jul 25, 2022

View reviewed changes