Upgrade to Rails 5.2upgrade-rails-5-2-ce

Updates changed method names and fixes spec failures

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb
index 909dbffa38f..db31e5280a3 100644
--- a/spec/lib/gitlab/current_settings_spec.rb
+++ b/spec/lib/gitlab/current_settings_spec.rb
@@ -80,7 +80,7 @@ describe Gitlab::CurrentSettings do
           # during the initialization phase of the test suite, so instead let's mock the internals of it
           expect(ActiveRecord::Base.connection).not_to receive(:active?)
           expect(ActiveRecord::Base.connection).not_to receive(:cached_table_exists?)
-          expect(ActiveRecord::Migrator).not_to receive(:needs_migration?)
+          expect_any_instance_of(ActiveRecord::MigrationContext).not_to receive(:needs_migration?)
           expect(ActiveRecord::QueryRecorder.new { described_class.current_application_settings }.count).to eq(0)
         end
       end
@@ -109,7 +109,7 @@ describe Gitlab::CurrentSettings do
 
         context 'with pending migrations' do
           before do
-            expect(ActiveRecord::Migrator).to receive(:needs_migration?).and_return(true)
+            expect_any_instance_of(ActiveRecord::MigrationContext).to receive(:needs_migration?).and_return(true)
           end
 
           shared_examples 'a non-persisted ApplicationSetting object' do