[1553] Update dependencies (May 2016) #1565

orenyk · 2016-05-15T17:42:51Z

Resolves #1553

Highlights:
- Update Devise to v4.1
- Update Capybara to v2.7
Email validators are now more permissive due to Devise update
Capybara matchers no longer return hidden inputs by default
Several new rubocop cops were implemented and dealt with

orenyk · 2016-05-15T20:47:27Z

Whoops forgot to update .travis.yml with the new Ruby version.

esoterik · 2016-05-17T16:04:42Z

Any reason we didn't update to ruby 2.3?

orenyk · 2016-05-18T05:50:26Z

Excellent point, I'll update and adjust.

orenyk · 2016-05-19T16:40:14Z

Updated with Ruby 2.3.1, we can merge this once we're done with #1566 (I'll have to rebase).

orenyk · 2016-05-22T05:49:41Z

Updated a few gems that had since pushed minor updates and rebased onto the latest master, resolving merge conflicts from #1538.

esoterik · 2016-05-23T20:27:52Z

spec/lib/csv_export_spec.rb

@@ -19,7 +19,8 @@

    it 'has the appropriate columns' do
      expect(csv.first.split(',')).to eq(
-        FactoryGirl.build(model).attributes.keys - PROTECTED_COLS)
+        FactoryGirl.build(model).attributes.keys - PROTECTED_COLS
+      )


is this preferable over this?

expect(csv.first.split(',')).to \ eq(FactoryGirl.build(model).attributes.keys - PROTECTED_COLS)

(Before I definitely preferred the split parentheses but now that rubocop forces the separate parenthesis line I think I prefer the above...)

Yea I prefer it your way, I'll go through and update where possible.

orenyk · 2016-05-24T01:50:58Z

Updated a bunch of rubocop fixes and had another update, ready for another look-through!

EDIT Also found another instance of #1528

esoterik · 2016-05-25T02:20:44Z

config/initializers/00_devise.rb

+  config.mailer_sender = if AppConfig.table_exists? && !AppConfig.first.nil?
+                           AppConfig.first.admin_email
+                         else
+                           config.mailer_sender = 'admin@reservations.app'


config.mailer_sender can be removed

Good catch!

esoterik · 2016-05-25T02:35:41Z

left a few small comments!

orenyk · 2016-05-25T04:32:23Z

Fixed, nice catches 😄. One more review?

esoterik · 2016-05-26T00:01:50Z

app/models/report.rb

@@ -64,7 +65,7 @@ def self.item_to_row(item)
  # get the average of an array of values, discounting nil values
  def self.average2(arr)
    arr = arr.reject(&:nil?)


isn't this the same as arr.compact!?

I'm going to address this comment since it's not really included in #1570 (as compared to most of the other comments) and then we should be good to go.

esoterik · 2016-05-26T00:12:02Z

app/models/equipment_item.rb

      end
+      new_notes += "\n#{name} changed from " + old_val + ' to ' + new_val\
+        + '.' if old_val && new_val
    end
    new_notes += "\n\n" + notes


same as this

orenyk · 2016-05-27T00:46:55Z

Updated Report.average2 to address your comment, switched out an if...else with a guard clause while I was in there 😄. If you're cool with that change then this is good to go!

esoterik · 2016-05-31T14:56:04Z

yup, this is good to go

orenyk · 2016-05-31T16:06:52Z

Great! I'm actually going to block this on #1566 after which I'll rebase and deal with any new rubocop errors before squashing for a final review.

orenyk · 2016-05-31T20:44:06Z

Rebasing now

Resolves #1553 - Highlights: - Update Ruby to 2.2.5 - Update Devise to v4.1 - Update Capybara to v2.7 - Email validators are now more permissive due to Devise update - Capybara matchers no longer return hidden inputs by default - Several new rubocop cops were implemented and dealt with

orenyk · 2016-05-31T21:50:52Z

@esoterik ready for another glance through, there were merge conflicts in the following files:

spec/lib/tasks/email_*_reminder_spec.rb
spec/controllers/contact_controller_spec.rb
spec/lib/csv_export_spec.rb

and a new rubocop error (missing .freeze in spec/controllers/reservations_controller_spec.rb). It passed specs and the updated rubocop (so should have green builds) - let me know when you've had a chance to skim through it so we can merge.

esoterik · 2016-06-01T14:09:53Z

I think this is ready!

orenyk · 2016-06-01T14:17:59Z

Thanks!

orenyk · 2016-06-01T14:27:21Z

Of course a few of our dependencies are already out of date, but nothing critical 😛. Let's aim to revisit this in a month (I'll open up a new issue).

orenyk added the 0 - needs review label May 15, 2016

orenyk force-pushed the 1553_dependency_update_201605 branch 2 times, most recently from ae9fb47 to f3234e4 Compare May 15, 2016 20:47

orenyk force-pushed the 1553_dependency_update_201605 branch from f3234e4 to a993dd6 Compare May 19, 2016 16:39

orenyk force-pushed the 1553_dependency_update_201605 branch 2 times, most recently from 5003a94 to 2edb90d Compare May 22, 2016 05:48

esoterik reviewed May 23, 2016
View reviewed changes

orenyk force-pushed the 1553_dependency_update_201605 branch from 2edb90d to 7ecbbed Compare May 24, 2016 01:44

esoterik reviewed May 25, 2016
View reviewed changes

esoterik added 1 - working and removed 0 - needs review labels May 25, 2016

orenyk force-pushed the 1553_dependency_update_201605 branch from 7ecbbed to 62ebbb1 Compare May 25, 2016 04:31

orenyk added 0 - needs review and removed 1 - working labels May 25, 2016

esoterik reviewed May 26, 2016
View reviewed changes

orenyk mentioned this pull request May 26, 2016

Enforce consistent string syntax #1570

Open

orenyk force-pushed the 1553_dependency_update_201605 branch from 62ebbb1 to c95ffcd Compare May 27, 2016 00:42

esoterik added 3 - ready to merge and removed 0 - needs review labels May 31, 2016

orenyk added 1 - working 0 - blocked and removed 3 - ready to merge 0 - blocked labels May 31, 2016

orenyk force-pushed the 1553_dependency_update_201605 branch from c95ffcd to 23d45c3 Compare May 31, 2016 21:48

orenyk added 0 - needs review and removed 1 - working labels May 31, 2016

esoterik added 3 - ready to merge and removed 0 - needs review labels Jun 1, 2016

orenyk merged commit 3127c81 into master Jun 1, 2016

orenyk removed the 3 - ready to merge label Jun 1, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[1553] Update dependencies (May 2016) #1565

[1553] Update dependencies (May 2016) #1565

orenyk commented May 15, 2016

orenyk commented May 15, 2016

esoterik commented May 17, 2016

orenyk commented May 18, 2016

orenyk commented May 19, 2016 •

edited

Loading

orenyk commented May 22, 2016

esoterik May 23, 2016 •

edited

Loading

orenyk May 23, 2016

orenyk commented May 24, 2016 •

edited

Loading

esoterik May 25, 2016

orenyk May 25, 2016

esoterik commented May 25, 2016

orenyk commented May 25, 2016

esoterik May 26, 2016

orenyk May 27, 2016

esoterik May 26, 2016

orenyk commented May 27, 2016

esoterik commented May 31, 2016

orenyk commented May 31, 2016

orenyk commented May 31, 2016

orenyk commented May 31, 2016

esoterik commented Jun 1, 2016

orenyk commented Jun 1, 2016

orenyk commented Jun 1, 2016

[1553] Update dependencies (May 2016) #1565

[1553] Update dependencies (May 2016) #1565

Conversation

orenyk commented May 15, 2016

orenyk commented May 15, 2016

esoterik commented May 17, 2016

orenyk commented May 18, 2016

orenyk commented May 19, 2016 • edited Loading

orenyk commented May 22, 2016

esoterik May 23, 2016 • edited Loading

Choose a reason for hiding this comment

orenyk May 23, 2016

Choose a reason for hiding this comment

orenyk commented May 24, 2016 • edited Loading

esoterik May 25, 2016

Choose a reason for hiding this comment

orenyk May 25, 2016

Choose a reason for hiding this comment

esoterik commented May 25, 2016

orenyk commented May 25, 2016

esoterik May 26, 2016

Choose a reason for hiding this comment

orenyk May 27, 2016

Choose a reason for hiding this comment

esoterik May 26, 2016

Choose a reason for hiding this comment

orenyk commented May 27, 2016

esoterik commented May 31, 2016

orenyk commented May 31, 2016

orenyk commented May 31, 2016

orenyk commented May 31, 2016

esoterik commented Jun 1, 2016

orenyk commented Jun 1, 2016

orenyk commented Jun 1, 2016

orenyk commented May 19, 2016 •

edited

Loading

esoterik May 23, 2016 •

edited

Loading

orenyk commented May 24, 2016 •

edited

Loading