diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-21 09:58:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-21 11:20:06 +0100 |
| commit | 62d16e515f6e9c82d3342172d77681472fecfa15 (patch) | |
| tree | e92571d20aa4b862dd39cbeaada4dc0d5864195a | |
| parent | 472fe597e02669964c165061391408de324420ed (diff) | |
| download | gitlab-ce-notification-dropdown-active-fix.tar.gz | |
Updated tests to not look for flash messagenotification-dropdown-active-fix
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 2 | ||||
| -rw-r--r-- | features/steps/profile/notifications.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 5afd83a522e..f77738f97f5 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -28,7 +28,7 @@ = label_tag :global_notification_level, "Global notification level", class: "label-light" %br .clearfix - .form-group.pull-left + .form-group.pull-left.global-notification-setting = render 'shared/notifications/button', notification_setting: @global_notification_setting, left_align: true .clearfix 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 |