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

Support Rails 6.1 #2398

Merged
merged 33 commits into from Mar 6, 2021
Merged

Support Rails 6.1 #2398

merged 33 commits into from Mar 6, 2021

Conversation

JonRowe
Copy link
Member

@JonRowe JonRowe commented Oct 15, 2020

This branch will become the root of Rails 6.1 development. The plan would be to launch this as a new version when Rails 6.1 is released, likely a major version as Rails versions supported will change.

Edit This will not be merged until we are ready to release the next version, it will be used as an available branch for those working on 6.1.

Todo:

  • View specs have changed behaviour surrounding helper modules, investigate and fix.
  • A controller spec has a broken config somehow
  • Generated controller spec "uploads" fails

Copy link
Member

@pirj pirj left a comment

Choose a reason for hiding this comment

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

Looks good.
I've missed the last build results, wondering how many things are broken.

spec/rspec/rails/example/view_example_group_spec.rb Outdated Show resolved Hide resolved
@benoittgt
Copy link
Member

benoittgt commented Nov 1, 2020

I do not understand why it is not able to find 3.10.0.pre. I have no issue locally to find them.

Using rspec 3.10.0.pre from source at `/Users/bti/code/rspec-dev/repos/rspec`

To test the CI, I switched 4012de7

@JonRowe
Copy link
Member Author

JonRowe commented Nov 2, 2020

@benoittgt @pirj My intent for this branch is to use it as dev / maintenance root branch so could you PR to it rather than push commits directly, especially for WIP commits...

(I really don't want force pushing to happen to this branch, as I want it available to be used by people running Rails 6.1 from git)

@JonRowe
Copy link
Member Author

JonRowe commented Nov 2, 2020

@benoittgt I'm going to unpick your commits to a PR, from now on can everyone PR to this branch and that should be the last force push

@benoittgt
Copy link
Member

benoittgt commented Dec 2, 2020

I just lauch a CI build for Rails v6.1.0.rc2 https://github.com/rspec/rspec-rails/actions/runs/396008092

Edit: success ✅ https://github.com/rspec/rspec-rails/actions/runs/396108630

@benoittgt
Copy link
Member

Ok. 3 commits need to be cherry pick if we want to make it workable rails-6-1-dev...rails-6.1.0.rc2-dev

  1. 05f3a2c
  2. 7300e06
  3. 5737b93

We will still have the current issue in the CI with Rails master and dependencies resolving. Should we have rails-6.1.0.rc2 + rails master in the CI for this branch?

@pirj
Copy link
Member

pirj commented Dec 2, 2020

Should we have rails-6.1.0.rc2 + rails master in the CI for this branch?

Sure, why not both? As long if we don't set required for those that consistently fail.

@benoittgt
Copy link
Member

Sure, why not both? As long if we don't set required for those that consistently fail.

Yes I am in favor of both.

@benoittgt
Copy link
Member

benoittgt commented Dec 9, 2020

Rails 6.1 has been released. I just updated to CI and if CI is good for #2408 I think we should release.

I will look at #2410

This was referenced Mar 15, 2021
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

8 participants