Skip to content

Fix Appraisals and test against the intended version of Rails #270

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

Merged
merged 3 commits into from
May 18, 2015

Conversation

benpickles
Copy link
Contributor

The pessimistic constraint was mis-targeted - for instance ~> 4.1 was actually specifying >= 4.1 && < 5.0 instead of the intended >= 4.1 && < 4.2 and thus the rails-4.1 Appraisal was actually testing against Rails 4.2.

I also dropped support for Rails 3.1 as it doesn't have watchable_files (

app.config.watchable_files.concat Dir["#{app.root}/app/assets/javascripts/**/*.jsx*"]
) and therefore needs some work. Also, I assume nobody's actually using react-rails with Rails 3.1 as there'd probably be a bug report by now.

The pessimistic constraint was mis-targeted so for instance `~> 4.1` was
actually specifying `>= 4.1 && < 5.0` instead of `>= 4.1 && < 4.2`.
Rails 3.1 doesn't support `watchable_files` (amongst other things). Also,
I'm assume nobody is actually using react-rails with Rails 3.1 as
there'd probably be a bug report by now.
@facebook-github-bot
Copy link

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at cla@fb.com. Thanks!

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@benpickles
Copy link
Contributor Author

Not sure why Travis is failing (undefined method api_only doesn't seem to mean anything in react-rails or rails itself), possibly just need to restart the job.

@rmosolgo
Copy link
Member

Thanks for fixing this! I thought I knew how ~> worked but apparently not :P

LGTM once Travis is green

@rmosolgo
Copy link
Member

Aaaand as you suspected, green after re-run!

Before

Only 2 Rails versions because minor versions were skipped:

3.2.21
4.2.1

After

3.2.21
4.0.13
4.1.10
4.2.1

rmosolgo pushed a commit that referenced this pull request May 18, 2015
Fix Appraisals and test against the intended version of Rails
@rmosolgo rmosolgo merged commit 47b81c3 into reactjs:master May 18, 2015
@rmosolgo
Copy link
Member

Thanks! 🎊

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.

3 participants