summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-21 09:19:32 +0000
committerDouwe Maan <douwe@gitlab.com>2015-09-21 09:19:32 +0000
commit183892fde98308c0d77f5ba7a9bdb23d79eebe43 (patch)
tree9cc63e2422b514e33337e9c3288c965a22bf7f97 /features
parent2460d290af892a24996b348c786757eb5398adc1 (diff)
parent47e926bec0a9da28daaca7dc92415b25f2301daf (diff)
downloadgitlab-ce-183892fde98308c0d77f5ba7a9bdb23d79eebe43.tar.gz
Merge branch 'notification-levels' into 'master'
Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
Diffstat (limited to 'features')
-rw-r--r--features/project/project.feature6
-rw-r--r--features/steps/project/project.rb14
2 files changed, 20 insertions, 0 deletions
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 079a190e356..15f77734cb2 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-button'
+ end
+
+ step 'I choose Mention setting' do
+ click_link 'On 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