Skip to content
代码片段 群组 项目
未验证 提交 609da852 编辑于 作者: Omar Qunsul's avatar Omar Qunsul
浏览文件

Changing ActiveRecord to ApplicationRecord in spec

上级 f33b8d2d
No related branches found
No related tags found
无相关合并请求
...@@ -4,4 +4,3 @@ Database/MultipleDatabases: ...@@ -4,4 +4,3 @@ Database/MultipleDatabases:
- 'db/post_migrate/20210317104032_set_iteration_cadence_automatic_to_false.rb' - 'db/post_migrate/20210317104032_set_iteration_cadence_automatic_to_false.rb'
- 'db/post_migrate/20210811122206_update_external_project_bots.rb' - 'db/post_migrate/20210811122206_update_external_project_bots.rb'
- 'db/post_migrate/20210812013042_remove_duplicate_project_authorizations.rb' - 'db/post_migrate/20210812013042_remove_duplicate_project_authorizations.rb'
- 'ee/spec/services/ee/merge_requests/update_service_spec.rb'
...@@ -305,7 +305,6 @@ def update_merge_request(opts) ...@@ -305,7 +305,6 @@ def update_merge_request(opts)
context 'when called inside an ActiveRecord transaction' do context 'when called inside an ActiveRecord transaction' do
it 'does not attempt to update code owner approval rules' do it 'does not attempt to update code owner approval rules' do
allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(true)
expect(::MergeRequests::SyncCodeOwnerApprovalRulesWorker).not_to receive(:perform_async) expect(::MergeRequests::SyncCodeOwnerApprovalRulesWorker).not_to receive(:perform_async)
update_merge_request(title: 'Title') update_merge_request(title: 'Title')
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册