summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-05-31 11:38:54 +0100
committerPhil Hughes <me@iamphill.com>2016-06-07 15:02:00 +0100
commit51a62fce040a307955d6e66d0a22f1bbfa068b38 (patch)
tree3192461e6bc6e6ebc7e89d28f80de294191ad23a
parent8fa8cba02ecdeecbbe020a049f5923afeceb6a1b (diff)
downloadgitlab-ce-51a62fce040a307955d6e66d0a22f1bbfa068b38.tar.gz
Fixed failing tests
-rw-r--r--app/views/projects/buttons/_notifications.html.haml2
-rw-r--r--features/steps/project/project.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 2348ceaa92b..3b97dc9328f 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -2,7 +2,7 @@
= form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
= f.hidden_field :level
.dropdown
- %button.btn.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } }
+ %button.btn.btn-default.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } }
= icon('bell')
= notification_title(@notification_setting.level)
= icon('caret-down')
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index a1785311c2b..2a1a8e776f0 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -126,7 +126,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end
step 'I click notifications drop down button' do
- click_link 'notifications-button'
+ find('#notifications-button').click
end
step 'I choose Mention setting' do