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

Fixes #30712 - pin shoulda_matcher < 4.4 #7926

Merged
merged 1 commit into from
Aug 26, 2020
Merged

Conversation

jlsherrill
Copy link
Contributor

@jlsherrill jlsherrill commented Aug 26, 2020

@theforeman-bot
Copy link
Member

Issues: #30712

ekohl
ekohl previously requested changes Aug 26, 2020
@@ -18,7 +18,7 @@
gem 'rubocop-rails', '~> 2.4.2'
gem 'poltergeist', '>= 1.18.0', :require => false
gem 'selenium-webdriver', :require => false
gem 'shoulda-matchers', '~> 4.0'
gem 'shoulda-matchers', '~> 4.0', '< 4.4'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script that converts this to RPM deps creates something ugly from this. It creates < 5.0 and < 4.4.

Suggested change
gem 'shoulda-matchers', '~> 4.0', '< 4.4'
gem 'shoulda-matchers', '>= 4.0', '< 4.4'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't think we created rpms for test gems, but no reason to not doing it the better way for copy/paste reasons :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, we indeed skip it for test gems so it probably wouldn't have mattered.

@@ -18,7 +18,7 @@
gem 'rubocop-rails', '~> 2.4.2'
gem 'poltergeist', '>= 1.18.0', :require => false
gem 'selenium-webdriver', :require => false
gem 'shoulda-matchers', '~> 4.0'
gem 'shoulda-matchers', '>= 4.0', '< 4.4'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it reasonable to expect they are going to fix it in the next release and just exclude the bad release?

Suggested change
gem 'shoulda-matchers', '>= 4.0', '< 4.4'
gem 'shoulda-matchers', '~> 4.0', '!= 4.4.0'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the linked commit, it suggests it started to depend on the Zeitwerk loader. #7843 did start the effort to move Foreman to use it, but that's still a draft.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reading the issue: thoughtbot/shoulda-matchers#1332 its unclear at this point. The change that broke it almost seems like it was intentional, but i don't know that a developer has commented on the issue.

Copy link
Member

@ezr-ondrej ezr-ondrej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eh, let's fix tests for now 🤷

@ezr-ondrej ezr-ondrej dismissed ekohl’s stale review August 26, 2020 14:14

The change was incorporated.

@ezr-ondrej
Copy link
Member

@ekohl could you approve please?

@ekohl ekohl merged commit 2801602 into theforeman:develop Aug 26, 2020
@ekohl
Copy link
Member

ekohl commented Aug 26, 2020

This probably needs chery picks.

@jlsherrill jlsherrill deleted the 30712 branch August 26, 2020 14:23
@ezr-ondrej
Copy link
Member

This probably needs chery picks.

Only for tests to be passing though.

@tbrisker
Copy link
Member

2.2 - 2a249b4
2.1 - 064052f

@ekohl
Copy link
Member

ekohl commented Aug 27, 2020

In the issue they mentioned that 4.4.1 should fix it again.

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.

5 participants