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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.8.2 release #2067

Merged
merged 9 commits into from Jan 17, 2019
Merged

Conversation

benoittgt
Copy link
Member

@benoittgt benoittgt commented Jan 13, 2019

This resolves #2066

Because this is my first time, I prefere to open a pull request to validate step by step. 馃槉

Checklist:

  • Check out 3-8-maintenance
  • Cherry pick bug fixes that aren't on 3-8-maintenance, editing changefile as necessary
  • Finalise changelog, bump version in lib/rspec/rails/version.rb and commit "Update version to x.x.x"
  • Git tag to new version
  • Run rake release VERSION=3.8.2 with an account that has credentials logged in
  • Ensure fully pushed to 3-8-maintenance
  • Check out master and ensure change log is updated. (This could be a PR from maintenance).
  • 馃帀

tkm-kj and others added 6 commits January 13, 2019 09:38
* Truncate method names further in system tests

ref: https://github.com/rspec/rspec-rails/pull/1999/files

If system test fails, a screenshot is taken, but if the file name exceeds 255 characters(e.g. using turnip), the following error will be output.

```
File name too long @ rb_sysopen
```

The file name is prepended with `failures_` so further truncation is needed.
@benoittgt benoittgt changed the title 3 8 maintenance prep 3.8.2 release Jan 13, 2019
@fables-tales
Copy link
Member

@benoittgt this looks great to me!

Is there any chance you could add this checklist to the wiki on rspec-dev, so we have it for next time? (you can use x-y-maintenance to represent major and minor, instead of 3-8-maintenance)

@fables-tales
Copy link
Member

@benoittgt this is going to be a party... you'll need the signing key for the RSpec gem, the password, and release bits on rubygems.

@JonRowe I don't have the key on the computer I'm currently travelling with. Could you email it to both me and @benoittgt?

@benoittgt do you have a GPG key? If so I'll sign and encrypt the password for the RSpec signing key and send it over to you with instructions.

@JonRowe do we have the procedure for setting your keys up documented somewhere?

Changelog.md Outdated
* Use `__dir__` instead of `__FILE__` in generated `rails_helper.rb` where
supported. (OKURA Masafumi, #2048)
* Add `have_enqueued` matcher as a "super" matcher to the `ActiveJob` matchers
making it easier to match on `ActiveJob` delivered emails (Joel Lubrano, #2047)
Copy link
Member

Choose a reason for hiding this comment

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

@benoittgt we don't typically release enhancements in a patch release, so these should be removed

Copy link
Member Author

@benoittgt benoittgt Jan 13, 2019

Choose a reason for hiding this comment

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

I removed them.

@benoittgt
Copy link
Member Author

Is there any chance you could add this checklist to the wiki on rspec-dev, so we have it for next time?

@samphippen except this I don't see any github wiki of place where it could be added. 馃 https://github.com/rspec/rspec-dev/blob/8b5a2ba438bb442861c43971f6378d5cd2a94d77/common_markdown_files/CONTRIBUTING.md.erb#L35

I just sent my PGP key to you and @JonRowe by email.

Thanks for the review!

@JonRowe
Copy link
Member

JonRowe commented Jan 13, 2019

@samphippen I'm not sure we do, my "documentation" is an email you sent me explaining it 馃槀

@JonRowe
Copy link
Member

JonRowe commented Jan 14, 2019

LGTM @benoittgt I recommend you merge and then release in short order.

@JonRowe
Copy link
Member

JonRowe commented Jan 15, 2019

@benoittgt can we add #2069 to this

@benoittgt
Copy link
Member Author

benoittgt commented Jan 16, 2019

The problem with #2069 is that we don't add #2047 in this patch release. So https://github.com/rspec/rspec-rails/pull/2069/files#diff-22e10b416305c8e9a9b607039ccfe28d is "deleted by us" when cherry picking.

I can backport this fix to work on code present in 3.8.2 and add a changelog specific for that. What do you think? Otherwise, we don't add it to this release.

@JonRowe
Copy link
Member

JonRowe commented Jan 16, 2019

I'd backport it as a PR to your branch keep the changelog but refer to the extra PR

This is a partial backport of rspec#2069 that doesn't include changes on
"have_enqueued_mail" tests.

When expecting no job to be enqueued, the matcher would expect exactly
one job not to have been enqueued. This commit changes so that it now expects
no jobs to have been enqueued.
@benoittgt
Copy link
Member Author

@JonRowe
Copy link
Member

JonRowe commented Jan 17, 2019

Github sometimes displays commit in time, and not "Commit" order, it could be that?

@benoittgt
Copy link
Member Author

Yes maybe. I sent a support request.

@benoittgt
Copy link
Member Author

It seems ok now.

@benoittgt benoittgt merged commit 0d0ce9e into rspec:3-8-maintenance Jan 17, 2019
@benoittgt benoittgt deleted the 3-8-maintenance-prep branch January 17, 2019 13:03
This was referenced Jan 18, 2019
@benoittgt
Copy link
Member Author

@samphippen Still interested to do #2067 (comment) 馃槉

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

Successfully merging this pull request may close these issues.

None yet

5 participants