summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-20 19:10:47 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-20 19:10:47 +0000
commitd5bbc86094d2d1ecb851cd0982a10a6f6997b435 (patch)
tree162bfa9cc2da0737e9b3a7e0454d0524845965da /spec/features
parent503bbcc3e7ce387e3f21ee0750d97ed749916dad (diff)
parentf112e2a1da696905e994bf5c37c10a950779b1a9 (diff)
downloadgitlab-ce-d5bbc86094d2d1ecb851cd0982a10a6f6997b435.tar.gz
Merge branch 'async-refs-dropdown' into 'master'
Refs dropdown is now loaded async ## What does this MR do? The refs dropdown is loaded async so not to block the page. ## What are the relevant issue numbers? Part of #18202 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png) See merge request !4508
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/badges/list_spec.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 51be81d634c..01e90618a98 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -1,8 +1,6 @@
require 'spec_helper'
feature 'list of badges' do
- include Select2Helper
-
background do
user = create(:user)
project = create(:project)
@@ -24,7 +22,11 @@ feature 'list of badges' do
end
scenario 'user changes current ref on badges list page', js: true do
- select2('improve/awesome', from: '#ref')
+ first('.js-project-refs-dropdown').click
+
+ page.within '.project-refs-form' do
+ click_link 'improve/awesome'
+ end
expect(page).to have_content 'badges/improve/awesome/build.svg'
end