summaryrefslogtreecommitdiff
path: root/spec/support/services
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2019-01-15 22:05:36 +0100
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-04-23 08:31:23 +0800
commit624a1cdab4da67c7b363602aa1178d0e6ff63475 (patch)
tree09892175f885c4c5f6725314b25a61280395efcb /spec/support/services
parent46bdbc5d776a0438366426e0ef48911123311744 (diff)
downloadgitlab-ce-624a1cdab4da67c7b363602aa1178d0e6ff63475.tar.gz
Upgrade Rails to 5.1.6.1
Model.new.attributes now also returns encrypted attributes.
Diffstat (limited to 'spec/support/services')
-rw-r--r--spec/support/services/migrate_to_ghost_user_service_shared_examples.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
index 62ae95df8c0..1284415da1f 100644
--- a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
+++ b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
@@ -45,7 +45,7 @@ shared_examples "migrating a deleted user's associated records to the ghost user
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 @@ shared_examples "migrating a deleted user's associated records to the ghost user
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