diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 15:31:39 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 15:31:39 +0000 |
| commit | 179783f1ce0ce16913199a84e65ebea5fb4422ec (patch) | |
| tree | 5df3ecad4b3c5544c635e888cf3ced75eb41ef8a /features | |
| parent | 15a87f3129635354f5c1978e76ce0b3f6a91c34a (diff) | |
| parent | 62d16e515f6e9c82d3342172d77681472fecfa15 (diff) | |
| download | gitlab-ce-179783f1ce0ce16913199a84e65ebea5fb4422ec.tar.gz | |
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 |