summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2015-09-16 18:03:48 -0500
committerPatricio Cano <suprnova32@gmail.com>2015-09-16 18:03:48 -0500
commitde1ffce7391a9e6adf07a8be60cd36bbc95ef2f3 (patch)
tree59fd5fb4792f2f91f8b0bfaa69de94be56ff8eae
parentfa6df2228e7d8957db4b37a44b687c71aac52449 (diff)
downloadgitlab-ce-de1ffce7391a9e6adf07a8be60cd36bbc95ef2f3.tar.gz
Added Spinach tests and updated CHANGELOG
-rw-r--r--CHANGELOG1
-rw-r--r--features/project/project.feature6
-rw-r--r--features/steps/project/project.rb14
3 files changed, 21 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 36ee3e69ab3..4e0e5d44be8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.0.0 (unreleased)
- Add support for Crowd
- Global Labels that are available to all projects
- Fix highlighting of deleted lines in diffs.
+ - Project notification level can be set on the project page itself
v 7.14.1
- Improve abuse reports management from admin area
diff --git a/features/project/project.feature b/features/project/project.feature
index 089ffcba14a..b3fb0794547 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -74,3 +74,9 @@ Feature: Project
Given I disable snippets in project
When I visit project "Shop" page
Then I should not see "Snippets" button
+
+ @javascript
+ Scenario: I edit Project Notifications
+ Given I click notifications drop down button
+ When I choose Mention setting
+ Then I should see Notification saved message
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 0404fd5e594..54c026395fc 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -130,4 +130,18 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'I should see back to group button' do
expect(page).to have_content 'Back to Group'
end
+
+ step 'I click notifications drop down button' do
+ click_link 'Notifications'
+ end
+
+ step 'I choose Mention setting' do
+ click_link 'Mention'
+ end
+
+ step 'I should see Notification saved message' do
+ page.within '.flash-container' do
+ expect(page).to have_content 'Notification settings saved'
+ end
+ end
end