diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
| commit | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch) | |
| tree | d572a6d931152ae0dd10427237f5811893438552 /spec/features/admin | |
| parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/admin')
| -rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 7bc904be69d..9b275a8897b 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -326,6 +326,8 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc end it 'loads usage ping payload on click', :js do + allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) + expect(page).to have_button 'Preview payload' find('.js-usage-ping-payload-trigger').click |