Skip to content

Commit bcc0451

Browse files
author
Filipa Lacerda
committed
Merge branch 'profile-notifications-dropdown-fix' into 'master'
Fixed profile notifications not being editable Closes #44198 See merge request gitlab-org/gitlab-ce!17808
2 parents f46ae65 + 1c74f55 commit bcc0451

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import NotificationsForm from '../../../../notifications_form';
2+
import notificationsDropdown from '../../../../notifications_dropdown';
3+
4+
document.addEventListener('DOMContentLoaded', () => {
5+
new NotificationsForm(); // eslint-disable-line no-new
6+
notificationsDropdown();
7+
});

spec/features/profiles/user_visits_notifications_tab_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
first('#notifications-button').click
1717
click_link('On mention')
1818

19-
expect(page).to have_content('On mention')
19+
expect(page).to have_selector('#notifications-button', text: 'On mention')
2020
end
2121
end

0 commit comments

Comments
 (0)