diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index b82de2ce2c5..5ef16f9a7db 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -3048,19 +3048,19 @@ RSpec.describe User do it "tracks old user record correctly" do expect do user.update_ip_address!("127.0.0.1") end.to change { - UserIpAddressHistory.uncached { UserIpAddressHistory.where(user_id: user.id).count } + UserIpAddressHistory.where(user_id: user.id).count }.by(1) freeze_time 10.minutes.from_now expect do user.update_ip_address!("0.0.0.0") end.to change { - UserIpAddressHistory.uncached { UserIpAddressHistory.where(user_id: user.id).count } + UserIpAddressHistory.where(user_id: user.id).count }.by(1) freeze_time 11.minutes.from_now expect do user.update_ip_address!("127.0.0.1") end.to_not change { - UserIpAddressHistory.uncached { UserIpAddressHistory.where(user_id: user.id).count } + UserIpAddressHistory.where(user_id: user.id).count } expect( @@ -3070,7 +3070,7 @@ RSpec.describe User do freeze_time 12.minutes.from_now expect do user.update_ip_address!("0.0.0.1") end.not_to change { - UserIpAddressHistory.uncached { UserIpAddressHistory.where(user_id: user.id).count } + UserIpAddressHistory.where(user_id: user.id).count } expect(UserIpAddressHistory.where(user_id: user.id).pluck(:ip_address).map(&:to_s)).to eq( diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb index c9ccf3bf4bd..e9dbb7f1587 100644 --- a/spec/requests/omniauth_callbacks_controller_spec.rb +++ b/spec/requests/omniauth_callbacks_controller_spec.rb @@ -1108,7 +1108,7 @@ RSpec.describe Users::OmniauthCallbacksController do class Strategy include OmniAuth::Strategy def other_phase - [418, {}, "I am a teapot"] + [418, {}, ["I am a teapot"]] end end