Upgrade to Rails 4.2 #2533

Souravirus · 2018-03-23T16:27:23Z

Related to #1832
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
code is in uniquely-named feature branch and has no merge conflicts
PR is descriptively titled
PR body includes fixes #0000-style reference to original issue #
ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.

Thanks!

…_test.rb

…ler.rb

…_mailer

…g in Gemfile

jywarren · 2018-04-06T15:08:36Z

This looks pretty good to me, to be honest. Almost all changes are minor OR changes to deliver and deliver_now. Fantastic work!

grvsachdeva

Really awesome work @Souravirus, Thanks for completing it 💯 🎉

grvsachdeva · 2018-04-06T15:58:24Z

test/integration/node_unique_views_test.rb

@@ -7,14 +7,14 @@ class NodeInsertExtrasTest < ActionDispatch::IntegrationTest
    assert_equal 0, Impression.count

    assert_difference 'Impression.count', 1 do
-      get "wiki/#{nodes(:about).slug}"
+      get "/wiki/#{nodes(:about).slug}" #gave the complete address changed from wiki to /wiki


feel free to remove this comment anytime

Yeah @Gauravano I will remove these

grvsachdeva · 2018-04-06T15:59:35Z

test/integration/node_unique_views_test.rb


      assert_response :success
    end

    assert_difference 'nodes(:about).totalviews', 0 do
      assert_difference 'Impression.count', 0 do
-        get "wiki/#{nodes(:about).slug}"
+        get "/wiki/#{nodes(:about).slug}" #gave the complete address changed from wiki to /wiki


this comment can also be removed

ryzokuken

Looks really good overall, nice work indeed!

That said, I thought that a few changes were general code improvements and had nothing to do with the Rails 4.2 upgrade. Let me know if I'm wrong, and if I'm not, consider moving them to different PRs.

ryzokuken · 2018-04-06T15:53:42Z

app/controllers/answers_controller.rb

@@ -65,8 +65,7 @@ def accept
        else
          @answer.accepted = true
          @answer.save
-          @answer.node.add_tag('answered', @answer.author)


I understand the other difference (the addition of deliver_now), but any reason in particular why you'd remove this line?

I removed it mistakenly. I would add it again. Thanks!!

ryzokuken · 2018-04-06T15:57:24Z

app/models/drupal_content_type_map.rb

@@ -12,6 +12,12 @@ class DrupalContentTypeMap < ActiveRecord::Base
                   lat_column_name: :lat,
                   lng_column_name: :lng

+  before_save :truncate_fields
+
+  def truncate_fields


Is this some Rails 4.2 specific thing? I just seems like a general improvement to type-assertion, in which case, can't we keep this in another PR instead?

I'm okay either way, but I really like when a PR deals with just one thing, makes things easier to reason about.

@ryzokuken
Actually these were added by @jywarren during the rails 4.2 update

Early in the upgrade process I found I had to do this to get one test to pass, so I believe for some reason this was 4.2 related. Good question!

Okay. @jywarren what do you say? I'd rather do a single thing in each PR.

The ones I added were Rails 4.2 specific, so I'm fine with them being squashed into this. Sometimes with our atypical legacy code we require workarounds to move up Rails versions which may not immediately be apparent from the upgrade checklist but are borne out by the CI tests.

More broadly I am very much in favor of what you're saying -- if things can be merged in separately, then we can refer back to this PR as a good, concise example of a version upgrade, as narrowly defined as possible! In this case, as soon as @Souravirus re-adds the line on line 68 of answers_controller.rb, I think we are good to move forward. Thanks for such a careful read-through!

ryzokuken · 2018-04-06T15:59:44Z

config/application.rb

@@ -106,5 +106,6 @@ class Application < Rails::Application

    # Allow mass assignments
    config.active_record.whitelist_attributes = false
+    config.active_record.raise_in_transactional_callbacks = true


Again, is this a code improvement which has nothing to do with the upgrade? If yes, I'd love if you cherry-picked this commit into another PR.

No @ryzokuken, its a commit regarding to the update

ryzokuken · 2018-04-06T16:00:19Z

config/database.yml.example

@@ -10,6 +10,7 @@ test:
  encoding: utf8
  pool: 5
  timeout: 5000
+  strict: false


Same as above

This was added by @jywarren in the update process.
Here is the screenshot:

Again, this was to get a test to pass. Thanks!

ryzokuken · 2018-04-06T16:00:31Z

config/database.yml.example

@@ -18,6 +19,7 @@ development:
  password: 
  encoding: utf8
  database: publiclaboratory
+  strict: false


Same as above

This was added by @jywarren in the update process

ryzokuken · 2018-04-06T16:00:56Z

config/database.yml.example

@@ -28,3 +30,4 @@ production:
  encoding: utf8
  pool: 5
  timeout: 5000
+  strict: false


Same as above

This was added by @jywarren in the update process

ryzokuken · 2018-04-06T16:01:07Z

config/environments/production.rb

-  # config.log_level = :debug
+  # Set to `:info` to match the current default, or set to `:debug` to opt-into
+  # the future default.
+  config.log_level = :info


Same as above

This was added by @jywarren in the update process

ryzokuken · 2018-04-06T16:58:49Z

Also, when we merge this, please make sure to squash and merge this.

@Souravirus if possible, once the contents of this PR get approved completely, squash them.

Souravirus · 2018-04-06T17:08:06Z

Yeah definitely I will squash them thanks @ryzokuken

Souravirus · 2018-04-06T17:40:30Z

Done the changes as suggested by @Gauravano and @ryzokuken . Please see these changes @Gauravano, @ryzokuken @jywarren. Thanks!!

jywarren · 2018-04-06T17:46:45Z

OK -- perfect. I will check with @icarito in a few hours for one final check and we will move ahead with this!

Souravirus · 2018-04-06T17:53:40Z

Okk thanks Sent from Yahoo Mail on Android On Fri, Apr 6, 2018 at 23:16, Jeffrey Warren<[email protected]> wrote: OK -- perfect. I will check with @icarito in a few hours for one final check and we will move ahead with this! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

sagarpreet-chadha

Wow...Fantastic work !

jywarren · 2018-04-06T20:08:46Z

This is merged now!!

jywarren · 2018-04-06T20:08:55Z

Congratulations @Souravirus and everybody!

Souravirus · 2018-04-06T20:14:39Z

Thanks !!

Souravirus · 2018-04-06T20:32:51Z

@jywarren when it will be updated in the original website?

jywarren · 2018-04-06T22:22:20Z

We'll try over the next few days. It's already running at stable.publiclab.org! Just want to do final checks before the main publication. Great work!!

…

On Fri, Apr 6, 2018, 3:33 PM Sourav Sahoo ***@***.***> wrote: @jywarren <https://github.com/jywarren> when it will be updated in the original website? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2533 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ5qq6wWm8iyS8sZJblpTxCc8s56Oks5tl9D0gaJpZM4S5BA-> .

seafr · 2018-04-07T06:24:59Z

@Souravirus congrats on successfully taking on such a big challenge.

Souravirus · 2018-04-07T07:06:37Z

thanks @seafr

icarito · 2018-04-09T06:57:40Z

Hey great work here, it's live on the publiclab.org website! Thanks for your contribution!

Souravirus · 2018-04-09T08:25:41Z

Ah! great. Thanks!!

* initial Rails 4.2 port * changing over to deliver_now for mails * updated Gemfile * truncating fixture field * truncating fixture field * nother fixture fix! fix! * nother fixture fix! fix! * last try with test dates for maps * truncation in model * strict: false in database.yml * back to before_save filter * back to before_save filter * deliver_now * strict back off... * strict back off... * Removed the error of undefined method 'any_instance' * changed wiki to /wiki because it was inside a integration test * Added deliver_now in the admin_mailer and node.rb * added test for AdminMailer.notify_node_moderators in notes_controller_test.rb * Added test for AdminMailer.notify_moderators_of_spam in admin_controller.rb * modified the deliver.now in comment_mailer.rb * Removed the errors related to reset_notify function in password_reset_mailer * modified the deliver_now in subscription_mailer.rb * modified the deliver_now in welcome_mailer.rb * Converted some assert_select to css_select and wrote rails-dom-testing in Gemfile * Added Gemfile.lock * Added few corrections * Removed conflicts * Modified the Gemfile.lock * Changed notes_controller * Corrected some suggestions * corrected some assert_select in editor_controller_test * Completed tests of controller_test.rb * corrected some assert_select * Removed few assert_select errors * Removed assert_select errors from notes_controller_test.rb * Reduced an error and removed all failures in functional * Removed the errors of tag_controller * Fixed all the errors and failures in functional folder * Removed errorfile * Removed all the errors * Added html-entities in rails test * Removed all fails * Removed some depreciation warnings * Removed a fail * Removed some depreciation warnings * Some changes done as suggested by reviewers

jywarren and others added 30 commits January 25, 2018 20:44

initial Rails 4.2 port

bc936fa

changing over to deliver_now for mails

5adb0a9

updated Gemfile

4bf77c0

truncating fixture field

cb8e1ff

nother fixture fix! fix!

be38930

last try with test dates for maps

0c8d3d2

truncation in model

104d567

strict: false in database.yml

7df42e7

back to before_save filter

4bffd0b

deliver_now

da1dd5e

strict back off...

edaf292

truncating fixture field

22e2bb6

nother fixture fix! fix!

3860745

back to before_save filter

9cd3bd0

strict back off...

425e46d

Removed the error of undefined method 'any_instance'

f3a269d

changed wiki to /wiki because it was inside a integration test

7dd450a

Added deliver_now in the admin_mailer and node.rb

a3f4830

added test for AdminMailer.notify_node_moderators in notes_controller…

0a89fad

…_test.rb

Added test for AdminMailer.notify_moderators_of_spam in admin_control…

4a3ac9e

…ler.rb

modified the deliver.now in comment_mailer.rb

b42dd41

Removed the errors related to reset_notify function in password_reset…

c6734e5

…_mailer

modified the deliver_now in subscription_mailer.rb

2e7a2fd

modified the deliver_now in welcome_mailer.rb

6f74b67

Converted some assert_select to css_select and wrote rails-dom-testin…

bebed43

…g in Gemfile

Added Gemfile.lock

e9f4738

Added few corrections

005f588

Removed conflicts

8e2c5f2

Modified the Gemfile.lock

8db3caf

Resolved conflicts

7e19e92

jywarren requested a review from a team April 6, 2018 15:07

grvsachdeva approved these changes Apr 6, 2018

View reviewed changes

grvsachdeva reviewed Apr 6, 2018

View reviewed changes

ryzokuken reviewed Apr 6, 2018

View reviewed changes

Some changes done as suggested by reviewers

3eb6230

jywarren added the ready label Apr 6, 2018

jywarren mentioned this pull request Apr 6, 2018

[WIP] Adding Search bar to Maps . #2582 #2585

Merged

5 tasks

sagarpreet-chadha reviewed Apr 6, 2018

View reviewed changes

jywarren merged commit 9795328 into publiclab:master Apr 6, 2018

jywarren mentioned this pull request Apr 6, 2018

initial Rails 4.2 port #1832

Closed

2 tasks

Souravirus deleted the rails-4.2_errors branch April 6, 2018 20:33

icarito mentioned this pull request Apr 8, 2018

Update Paperclip to v5 #2589

Merged

jywarren mentioned this pull request Feb 26, 2019

Planning Issue: Upgrade rails from 3.2 to rails 6 publiclab/mapknitter#305

Open

20 tasks

Upgrade to Rails 4.2 #2533

Upgrade to Rails 4.2 #2533

Conversation

Souravirus commented Mar 23, 2018 • edited by jywarren Loading

jywarren commented Apr 6, 2018

grvsachdeva left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryzokuken left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Souravirus Apr 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jywarren Apr 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Souravirus Apr 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryzokuken commented Apr 6, 2018

Souravirus commented Apr 6, 2018

Souravirus commented Apr 6, 2018

jywarren commented Apr 6, 2018

Souravirus commented Apr 6, 2018 via email

sagarpreet-chadha left a comment

Choose a reason for hiding this comment

jywarren commented Apr 6, 2018

jywarren commented Apr 6, 2018

Souravirus commented Apr 6, 2018

Souravirus commented Apr 6, 2018

jywarren commented Apr 6, 2018 via email

seafr commented Apr 7, 2018

Souravirus commented Apr 7, 2018

icarito commented Apr 9, 2018

Souravirus commented Apr 9, 2018

Souravirus commented Mar 23, 2018 •

edited by jywarren

Loading

Souravirus Apr 6, 2018 •

edited

Loading

jywarren Apr 6, 2018 •

edited

Loading

Souravirus Apr 6, 2018 •

edited

Loading