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

Upgrade to Rails 4.2 #1910

Merged
merged 8 commits into from
Jun 15, 2016
Merged

Upgrade to Rails 4.2 #1910

merged 8 commits into from
Jun 15, 2016

Conversation

dnrce
Copy link
Member

@dnrce dnrce commented Aug 9, 2015

Resolves #1775

@dnrce dnrce added this to the 2.4 milestone Aug 9, 2015
@dnrce
Copy link
Member Author

dnrce commented Aug 9, 2015

Letting Travis do the testing work for me. :-)

Still needs some work -- closing until I revisit.

@dnrce dnrce closed this Aug 9, 2015
@dnrce dnrce reopened this Aug 10, 2015
@dnrce dnrce force-pushed the rails42 branch 2 times, most recently from d0dca3a to 2baff2a Compare August 10, 2015 17:47
@dnrce
Copy link
Member Author

dnrce commented Aug 18, 2015

I'm puzzled by the failures of assert_select_encoded. Anyone else is welcome to take a look.

@mattr-
Copy link
Member

mattr- commented Sep 3, 2015

Looks like some tests are still failing. Are those legit errors that we should try and fix?

@dnrce
Copy link
Member Author

dnrce commented Sep 3, 2015

These are legit issues. Some are only with the tests themselves. The URL whitelist issue also needs to be addressed.

I reopened this so I could push some rebased changes, and to get more eyes on it. Not ready to merge.

@dnrce dnrce changed the title Upgrade to Rails 4.2 [DO NOT MERGE] Upgrade to Rails 4.2 Sep 3, 2015
@dnrce
Copy link
Member Author

dnrce commented Oct 11, 2015

Opened rails/rails-dom-testing#42 regarding the assert_select_encoded issues.

@mattr-
Copy link
Member

mattr- commented Jan 21, 2016

Can we get a rebase on this? I'm rerunning the tests on this locally and would love to merge it soon. If it's not something that you can get to soon, I can pull it locally and rebase it.

@dnrce
Copy link
Member Author

dnrce commented Jan 21, 2016

Updated. I had a few test changes in my local branch so this might not be 100% up to date, but it resolves the conflict.

Still not passing.

@dnrce dnrce force-pushed the rails42 branch 2 times, most recently from 7fe6ab4 to ec71b16 Compare February 28, 2016 19:45
Support Rails 4.2
@dnrce dnrce force-pushed the rails42 branch 2 times, most recently from 0baafa8 to bf68bac Compare May 22, 2016 17:09
@dnrce
Copy link
Member Author

dnrce commented May 22, 2016

Filed another bug against rails-dom-testing that is causing assert_select to fail on the Atom feeds: rails/rails-dom-testing#51

@dnrce
Copy link
Member Author

dnrce commented May 22, 2016

And another one: rails/rails-dom-testing#52 Edit: false alarm, this behavior change is documented.

@dnrce dnrce force-pushed the rails42 branch 2 times, most recently from 230cf87 to 0fccdd7 Compare May 22, 2016 21:50
@dnrce dnrce changed the title [DO NOT MERGE] Upgrade to Rails 4.2 Upgrade to Rails 4.2 May 22, 2016
@dnrce
Copy link
Member Author

dnrce commented May 22, 2016

After fighting through/working around all the annoying behavior changes in rails-dom-testing, I think this is ready to go!

  • The unit tests are now passing.
  • The feature tests have a slight regression from 5 to 6 failures but they're all the same type so IMO it's probably part of the existing set of issues stemming from the UI changes. The one new failure is features/recurring_todos.feature:15.

It's only taken me nine months. But hey, I beat the release of Rails 5. 😄

@dnrce
Copy link
Member Author

dnrce commented May 23, 2016

Actually, doing a little bit of squashing..

dnrce added 7 commits May 22, 2016 21:58
* Update boilerplate with `bin/rake rails:upgrade`
* Use test instead of test:all rake task
* Change stylesheet extensions from .css.scss to .scss
* Update docs to use localhost instead of 0.0.0.0 because Rails 4.2
  no longer listens on all addresses by default.
assert_select has been moved into the rails-dom-testing gem and is now
based on Nokogiri.

* Remove assert_tag and assert_xml_select
* Quote CSS attribute selector values
* Use decoded versions of HTML in assert_select. Nokogiri decodes
  elements prior to matching.
* Add a test helper for entities such as ` ` for which it's
  difficult or confusing to include the decoded version directly in the
  assertion.
* Assert directly on Atom feeds' XML namespace because it isn't
  selectable as an attribute
@dnrce
Copy link
Member Author

dnrce commented May 23, 2016

Squashed from 16 to 8 commits.

@mattr-
Copy link
Member

mattr- commented May 23, 2016

Cool. Thanks for working on this! I'll take a look soon.

On Sun, May 22, 2016 at 9:07 PM, Dan Rice notifications@github.com wrote:

Squashed from 16 to 8 commits.


You are receiving this because you commented.
Reply to this email directly or view it on GitHub
#1910 (comment)

@dnrce
Copy link
Member Author

dnrce commented Jun 8, 2016

@mattr-, any chance to review this yet? I'm just hoping to get this in before Rails 5 makes this officially obsolete. 😄

@@ -27,6 +27,10 @@
# number of complex assets.
config.assets.debug = true

# Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params.
config.assets.digest = true
Copy link
Member

Choose a reason for hiding this comment

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

i'm not sure we want to enable digests in development mode, do we?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's to provide better parity between environments. See rails/rails#15155

Copy link
Member

Choose a reason for hiding this comment

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

👍

@mattr-
Copy link
Member

mattr- commented Jun 10, 2016

This looks good to me.

@mattr-
Copy link
Member

mattr- commented Jun 15, 2016

Forgot to merge this the other day. 😞

@mattr- mattr- merged commit 7748253 into TracksApp:master Jun 15, 2016
@dnrce
Copy link
Member Author

dnrce commented Jun 15, 2016

Woohoo! Thanks, @mattr-!

@dnrce dnrce deleted the rails42 branch June 15, 2016 00:33
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.

2 participants