Commit 790f8b5b authored by Jasper Maes's avatar Jasper Maes Committed by Heinrich Lee Yu
Browse files

Upgrade Rails to 5.1.6.1

Model.new.attributes now also returns encrypted attributes.
parent 232d878afbb7
......@@ -17,7 +17,7 @@ def show_backtrace(values)
def callback(name, start, finish, message_id, values)
show_backtrace(values) if ENV['QUERY_RECORDER_DEBUG']
if values[:name]&.include?("CACHE") && skip_cached
if values[:cached] && skip_cached
@cached << values[:sql]
elsif !values[:name]&.include?("SCHEMA")
@log << values[:sql]
......
# frozen_string_literal: true
module TestRequestHelpers
def test_request(remote_ip: '127.0.0.1')
ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new)
def test_request(remote_ip: '127.0.0.1', controller: nil)
ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new, controller)
end
end
......@@ -45,7 +45,7 @@
context "race conditions" do
context "when #{record_class_name} migration fails and is rolled back" do
before do
expect_any_instance_of(record_class::ActiveRecord_Associations_CollectionProxy)
expect_any_instance_of(ActiveRecord::Associations::CollectionProxy)
.to receive(:update_all).and_raise(ActiveRecord::Rollback)
end
......@@ -66,7 +66,7 @@
context "when #{record_class_name} migration fails with a non-rollback exception" do
before do
expect_any_instance_of(record_class::ActiveRecord_Associations_CollectionProxy)
expect_any_instance_of(ActiveRecord::Associations::CollectionProxy)
.to receive(:update_all).and_raise(ArgumentError)
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment