summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-04 20:46:44 +0000
committerRobert Speicher <robert@gitlab.com>2017-04-04 20:46:44 +0000
commitd3ab818c25eadf132ee9e719c6112fadf7dc1eca (patch)
tree5ebdc30c0cbc1ef90b366627c301cb47895dd462
parent4dd841c95aea291544bf69e796a757ba82f06a77 (diff)
parent44a5c6b2a3ef912d823de59487ce9f533f08d7bf (diff)
downloadgitlab-ce-d3ab818c25eadf132ee9e719c6112fadf7dc1eca.tar.gz
Merge branch '30461-fix-transient-failure' into 'master'
Fix a transient spec failure in "Admin Health Check" feature spec Closes #30461 See merge request !10454
-rw-r--r--spec/features/admin/admin_health_check_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
index f7e49a56deb..523afa2318f 100644
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -2,7 +2,6 @@ require 'spec_helper'
feature "Admin Health Check", feature: true do
include StubENV
- include WaitForAjax
before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
@@ -24,11 +23,12 @@ feature "Admin Health Check", feature: true do
expect(page).to have_selector('#health-check-token', text: token)
end
- describe 'reload access token', js: true do
+ describe 'reload access token' do
it 'changes the access token' do
orig_token = current_application_settings.health_check_access_token
click_button 'Reset health check access token'
- wait_for_ajax
+
+ expect(page).to have_content('New health check access token has been generated!')
expect(find('#health-check-token').text).not_to eq orig_token
end
end