diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-16 20:55:05 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-19 12:40:30 -0500 |
| commit | 521be29fb68920146bd883cc01503daec44ec0d1 (patch) | |
| tree | 36f1e62d92cde8c6ff0dfa4b8188afcf4428af5f | |
| parent | 706ab1adf895815ef7029aa3d5bbc9375184548c (diff) | |
| download | gitlab-ce-521be29fb68920146bd883cc01503daec44ec0d1.tar.gz | |
Merge branch 'profile-notifications-dropdown-fix' into 'master'
Fixed profile notifications not being editable
Closes #44198
See merge request gitlab-org/gitlab-ce!17808
| -rw-r--r-- | app/assets/javascripts/pages/profiles/notifications/show/index.js | 7 | ||||
| -rw-r--r-- | spec/features/profiles/user_visits_notifications_tab_spec.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/profiles/notifications/show/index.js b/app/assets/javascripts/pages/profiles/notifications/show/index.js new file mode 100644 index 00000000000..2e24a10fa5c --- /dev/null +++ b/app/assets/javascripts/pages/profiles/notifications/show/index.js @@ -0,0 +1,7 @@ +import NotificationsForm from '../../../../notifications_form'; +import notificationsDropdown from '../../../../notifications_dropdown'; + +document.addEventListener('DOMContentLoaded', () => { + new NotificationsForm(); // eslint-disable-line no-new + notificationsDropdown(); +}); diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb index 1952fdae798..95953fbcfac 100644 --- a/spec/features/profiles/user_visits_notifications_tab_spec.rb +++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb @@ -16,6 +16,6 @@ feature 'User visits the notifications tab', :js do first('#notifications-button').click click_link('On mention') - expect(page).to have_content('On mention') + expect(page).to have_selector('#notifications-button', text: 'On mention') end end |