Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00
parent f72ad67a39 894da3dcca
commit 6cd5b3bbe5
60 changed files with 738 additions and 319 deletions
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@ -5,6 +5,7 @@ require 'rails_helper'
 describe ApplicationController, type: :controller do
  controller do
    include UserTrackingConcern
+
    def show
      render plain: 'show'
    end
@ -49,6 +50,7 @@ describe ApplicationController, type: :controller do
      get :show

      expect_updated_sign_in_at(user)
+      expect(Redis.current.get("account:#{user.account_id}:regeneration")).to eq 'true'
      expect(RegenerationWorker).to have_received(:perform_async)
    end