diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-12 16:55:54 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-13 18:24:21 +0300 |
commit | 31e28ebcebc054eaeef2eddba64ff2ff7ca3104f (patch) | |
tree | 4402445fc4977c59582470d2f2d2bdf14b553388 /features/steps/shared | |
parent | ab4ea3720c084063ab83cef3aaf3a0b6adbc2a3c (diff) |
Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.
Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.
Fixes gitlab-org/gitlab-ce#14949
Diffstat (limited to 'features/steps/shared')
-rw-r--r-- | features/steps/shared/issuable.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb index b6d70a26c21..24b3fb6eacb 100644 --- a/features/steps/shared/issuable.rb +++ b/features/steps/shared/issuable.rb @@ -71,13 +71,16 @@ module SharedIssuable step 'I should not see any related merge requests' do page.within '.issue-details' do - expect(page).not_to have_content('.merge-requests') + expect(page).not_to have_content('#merge-requests .merge-requests-title') end end step 'I should see the "Enterprise fix" related merge request' do - page.within '.merge-requests' do + page.within '#merge-requests .merge-requests-title' do expect(page).to have_content('1 Related Merge Request') + end + + page.within '#merge-requests ul' do expect(page).to have_content('Enterprise fix') end end |