diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 18:31:39 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 18:52:06 +0300 |
| commit | 605e122952e7c5595b2e977d29c03dc70930a848 (patch) | |
| tree | 9a1750b4863a5cdf0cd0f019e9d123c7ab4b25cc /features | |
| parent | 16b4218791958826896344fdc3403a2dcdc23a58 (diff) | |
Merge branch 'notification-dropdown-active-fix' into 'master'
Fixed issue with notification dropdown not updating active
## What does this MR do?
This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success.
## What are the relevant issue numbers?
Closes #18480
## Screenshots (if relevant)
See merge request !4615
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/profile/notifications.rb | 4 | ||||
| -rw-r--r-- | features/steps/project/project.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/features/steps/profile/notifications.rb b/features/steps/profile/notifications.rb index 979f4692d5a..7e339443b75 100644 --- a/features/steps/profile/notifications.rb +++ b/features/steps/profile/notifications.rb @@ -15,8 +15,6 @@ class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps end step 'I should see Notification saved message' do - page.within '.flash-container' do - expect(page).to have_content 'Notification settings saved' - end + expect(page).to have_content 'On mention' end end diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index 98b57e5cbfb..76fefee9254 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -134,8 +134,8 @@ class Spinach::Features::Project < Spinach::FeatureSteps end step 'I should see Notification saved message' do - page.within '.flash-container' do - expect(page).to have_content 'Notification settings saved' + page.within '#notifications-button' do + expect(page).to have_content 'On mention' end end |