Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rspec-rails to v4.0.1 #20793

Merged
merged 2 commits into from
Nov 10, 2020
Merged

Bump rspec-rails to v4.0.1 #20793

merged 2 commits into from
Nov 10, 2020

Conversation

agrare
Copy link
Member

@agrare agrare commented Nov 9, 2020

Rspec-rails released a v4.0 back in March

@miq-bot
Copy link
Member

miq-bot commented Nov 9, 2020

Checked commits agrare/manageiq@e8a1f83~...9224885 with ruby 2.6.3, rubocop 0.82.0, haml-lint 0.35.0, and yamllint
2 files checked, 0 offenses detected
Everything looks fine. ⭐

@Fryguy Fryguy self-assigned this Nov 10, 2020
@Fryguy Fryguy merged commit 0fbfd69 into ManageIQ:master Nov 10, 2020
@NickLaMuro
Copy link
Member

@agrare @Fryguy Can I get at least a heads up when you plan on making Gemfile changes like this? At least on until he Rails 6.0 stuff is merged...

I am having to rebase my rails-6 stuff multiple times a day as it is, and this kind of PR isn't helping things, specifically when the only public facing rational I get for this existing is:

Rspec-rails released a v4.0 back in March

@NickLaMuro
Copy link
Member

NickLaMuro commented Nov 10, 2020

Case in point...

#20778 (comment)

miq-bot commented 1 minute ago

This pull request is not mergeable. Please rebase and repush.

EDIT: Furthermore, after looking more closely, I had to end up solving the same thing you did:

NickLaMuro@5187990

git show of the commit since there is a good change it will be lost to a rebase at some point
From 5187990b91596ef8eb349eaee93e1377b7de8074 Mon Sep 17 00:00:00 2001
From: Nick LaMuro <nicklamuro@gmail.com>
Date: Tue, 29 Sep 2020 16:21:50 -0500
Subject: [PATCH] [rails6][evm_spec_helper.rb] require 'rspec/mocks'

This doesn't seem to be included by default anymore, as the following
error was generated without it:

    An error occurred while loading spec_helper.
    Failure/Error: extend RSpec::Mocks::ExampleMethods

    NameError:
      uninitialized constant RSpec::Mocks::ExampleMethods
    # ./spec/support/evm_spec_helper.rb:13:in `<module:EvmSpecHelper>'
    # ./spec/support/evm_spec_helper.rb:12:in `<top (required)>'
    # ./spec/spec_helper.rb:21:in `block in <top (required)>'
    # ./spec/spec_helper.rb:21:in `each'
    # ./spec/spec_helper.rb:21:in `<top (required)>'
    No examples found.

    Finished in 0.00004 seconds (files took 8.12 seconds to load)
    0 examples, 0 failures, 1 error occurred outside of examples
 spec/support/evm_spec_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/support/evm_spec_helper.rb b/spec/support/evm_spec_helper.rb
index a44433514f4..e1ce73f695c 100644
--- a/spec/support/evm_spec_helper.rb
+++ b/spec/support/evm_spec_helper.rb
@@ -9,6 +9,8 @@
 $log.level = env_level
 Rails.logger.level = env_level
 
+require 'rspec/mocks'
+
 module EvmSpecHelper
   extend RSpec::Mocks::ExampleMethods

@agrare agrare deleted the bump_rspec_rails branch November 10, 2020 22:51
@agrare
Copy link
Member Author

agrare commented Nov 10, 2020

@NickLaMuro sorry that you have to rebase, wasn't my intention to cause a conflict in your PR I had no idea you were tackling the same problem. I'll try to let you know before making changes that might conflict with open PRs but that is hard to tell ahead of time.

On the plus side, one fewer change that you have to carry in your rails 6 PRs 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants