summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-03-19 21:27:11 +0000
committerRobert Speicher <robert@gitlab.com>2018-03-19 21:27:11 +0000
commit956bd6a45861dccc40591e02cf36e895a6fc4f5b (patch)
tree204b51914ffd00e75b042eaf26b0ab76d08bc1f7 /spec/features
parent09ae0071da1e0284a7757153da977516c385118d (diff)
parenta200619d14bf1d90c21503ec358a30ca84d5337f (diff)
downloadgitlab-ce-956bd6a45861dccc40591e02cf36e895a6fc4f5b.tar.gz
Merge branch 'ajax-requests-in-performance-bar' into 'master'
Show Ajax requests in performance bar Closes #43925 See merge request gitlab-org/gitlab-ce!17742
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/user_can_display_performance_bar_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/user_can_display_performance_bar_spec.rb b/spec/features/user_can_display_performance_bar_spec.rb
index 975c157bcf5..e069c2fddd1 100644
--- a/spec/features/user_can_display_performance_bar_spec.rb
+++ b/spec/features/user_can_display_performance_bar_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe 'User can display performance bar', :js do
shared_examples 'performance bar cannot be displayed' do
it 'does not show the performance bar by default' do
- expect(page).not_to have_css('#peek')
+ expect(page).not_to have_css('#js-peek')
end
context 'when user press `pb`' do
@@ -12,14 +12,14 @@ describe 'User can display performance bar', :js do
end
it 'does not show the performance bar by default' do
- expect(page).not_to have_css('#peek')
+ expect(page).not_to have_css('#js-peek')
end
end
end
shared_examples 'performance bar can be displayed' do
it 'does not show the performance bar by default' do
- expect(page).not_to have_css('#peek')
+ expect(page).not_to have_css('#js-peek')
end
context 'when user press `pb`' do
@@ -28,7 +28,7 @@ describe 'User can display performance bar', :js do
end
it 'shows the performance bar' do
- expect(page).to have_css('#peek')
+ expect(page).to have_css('#js-peek')
end
end
end
@@ -41,7 +41,7 @@ describe 'User can display performance bar', :js do
it 'shows the performance bar by default' do
refresh # Because we're stubbing Rails.env after the 1st visit to root_path
- expect(page).to have_css('#peek')
+ expect(page).to have_css('#js-peek')
end
end