Merge branch 'master' into define-feature-request

Conflicts:
	PROCESS.md

9 files changed, 52 insertions, 1 deletions

diff --git a/features/project/archived_projects.feature b/features/project/archived.feature
index 9aac29384ba..9aac29384ba 100644
--- a/features/project/archived_projects.feature
+++ b/features/project/archived.feature
diff --git a/features/project/commits/commit_comments.feature b/features/project/commits/comments.feature
index a1aa745a681..a1aa745a681 100644
--- a/features/project/commits/commit_comments.feature
+++ b/features/project/commits/comments.feature
diff --git a/features/project/commits/commit_diff_comments.feature b/features/project/commits/diff_comments.feature
index b26019f832f..b26019f832f 100644
--- a/features/project/commits/commit_diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
diff --git a/features/project/commits/commits_user_lookup.feature b/features/project/commits/user_lookup.feature
index f3864c0ab38..f3864c0ab38 100644
--- a/features/project/commits/commits_user_lookup.feature
+++ b/features/project/commits/user_lookup.feature
diff --git a/features/project/create_project.feature b/features/project/create.feature
index 395a3218b2b..bb8e3a368ed 100644
--- a/features/project/create_project.feature
+++ b/features/project/create.feature
@@ -3,6 +3,7 @@ Feature: Create Project
   A user with ability to create a project
   Should be able to create a new one
 
+  @javascript
   Scenario: User create a project
     Given I sign in as a user
     When I visit new project page
@@ -19,4 +20,4 @@ Feature: Create Project
     And I click on HTTP
     Then Remote url should update to http link
     And If I click on SSH
-    Then Remote url should update to ssh link
\ No newline at end of file
+    Then Remote url should update to ssh link
diff --git a/features/project/fork_project.feature b/features/project/fork.feature
index dc477ca3bf3..dc477ca3bf3 100644
--- a/features/project/fork_project.feature
+++ b/features/project/fork.feature
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 435c47a276c..6a2ba7e3b28 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -95,3 +95,47 @@ Feature: Project Merge Requests
     Given I visit merge request page "Bug NS-04"
     And I leave a comment with a header containing "Comment with a header"
     Then The comment with the header should not have an ID
+
+  # Toggling inline comments
+
+  @javascript
+  Scenario: I hide comments on a merge request diff with comments in a single file
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    Then I should not see a comment like "Line is wrong" in the second file
+
+  @javascript
+  Scenario: I show comments on a merge request diff with comments in a single file
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    And I click link "Show inline discussion" of the second file
+    Then I should see a comment like "Line is wrong" in the second file
+
+  @javascript
+  Scenario: I hide comments on a merge request diff with comments in multiple files
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is correct" on line 12 of the first file
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    Then I should not see a comment like "Line is wrong" in the second file
+    And I should still see a comment like "Line is correct" in the first file
+
+  @javascript
+  Scenario: I show comments on a merge request diff with comments in multiple files
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is correct" on line 12 of the first file
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    And I click link "Show inline discussion" of the second file
+    Then I should see a comment like "Line is wrong" in the second file
+    And I should still see a comment like "Line is correct" in the first file
diff --git a/features/project/public_projects.feature b/features/project/public.feature
index c5a9da14c54..c5a9da14c54 100644
--- a/features/project/public_projects.feature
+++ b/features/project/public.feature
diff --git a/features/project/service.feature b/features/project/service.feature
index 46b983e8f9a..a5af065c9e7 100644
--- a/features/project/service.feature
+++ b/features/project/service.feature
@@ -37,6 +37,12 @@ Feature: Project Services
     And I fill Assembla settings
     Then I should see Assembla service settings saved
 
+  Scenario: Activate Slack service
+    When I visit project "Shop" services page
+    And I click Slack service link
+    And I fill Slack settings
+    Then I should see Slack service settings saved
+
   Scenario: Activate email on push service
     When I visit project "Shop" services page
     And I click email on push service link