summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
Diffstat (limited to 'features/project')
-rw-r--r--features/project/issues/references.feature28
-rw-r--r--features/project/merge_requests/references.feature31
2 files changed, 46 insertions, 13 deletions
diff --git a/features/project/issues/references.feature b/features/project/issues/references.feature
index bf7a4c6cb91..4ae2d653337 100644
--- a/features/project/issues/references.feature
+++ b/features/project/issues/references.feature
@@ -2,30 +2,32 @@
Feature: Project Issues References
Background:
Given I sign in as "John Doe"
+ And public project "Community"
And "John Doe" owns public project "Community"
- And project "Community" has "Public Issue 01" open issue
+ And project "Community" has "Community issue" open issue
And I logout
And I sign in as "Mary Jane"
- And "Mary Jane" owns private project "Private Library"
- And project "Private Library" has "Fix NS-01" open merge request
- And project "Private Library" has "Private Issue 01" open issue
- And I visit merge request page "Fix NS-01"
- And I leave a comment referencing issue "Public Issue 01" from "Fix NS-01" merge request
- And I visit issue page "Private Issue 01"
- And I leave a comment referencing issue "Public Issue 01" from "Private Issue 01" issue
+ And private project "Enterprise"
+ And "Mary Jane" owns private project "Enterprise"
+ And project "Enterprise" has "Enterprise issue" open issue
+ And project "Enterprise" has "Enterprise fix" open merge request
+ And I visit issue page "Enterprise issue"
+ And I leave a comment referencing issue "Community issue"
+ And I visit merge request page "Enterprise fix"
+ And I leave a comment referencing issue "Community issue"
And I logout
@javascript
Scenario: Viewing the public issue as a "John Doe"
Given I sign in as "John Doe"
- When I visit issue page "Public Issue 01"
+ When I visit issue page "Community issue"
Then I should not see any related merge requests
And I should see no notes at all
@javascript
Scenario: Viewing the public issue as "Mary Jane"
Given I sign in as "Mary Jane"
- When I visit issue page "Public Issue 01"
- Then I should see the "Fix NS-01" related merge request
- And I should see a note linking to "Fix NS-01" merge request
- And I should see a note linking to "Private Issue 01" issue
+ When I visit issue page "Community issue"
+ Then I should see the "Enterprise fix" related merge request
+ And I should see a note linking to "Enterprise fix" merge request
+ And I should see a note linking to "Enterprise issue" issue
diff --git a/features/project/merge_requests/references.feature b/features/project/merge_requests/references.feature
new file mode 100644
index 00000000000..571612261a9
--- /dev/null
+++ b/features/project/merge_requests/references.feature
@@ -0,0 +1,31 @@
+@project_merge_requests
+Feature: Project Merge Requests References
+ Background:
+ Given I sign in as "John Doe"
+ And public project "Community"
+ And "John Doe" owns public project "Community"
+ And project "Community" has "Community fix" open merge request
+ And I logout
+ And I sign in as "Mary Jane"
+ And private project "Enterprise"
+ And "Mary Jane" owns private project "Enterprise"
+ And project "Enterprise" has "Enterprise issue" open issue
+ And project "Enterprise" has "Enterprise fix" open merge request
+ And I visit issue page "Enterprise issue"
+ And I leave a comment referencing issue "Community fix"
+ And I visit merge request page "Enterprise fix"
+ And I leave a comment referencing issue "Community fix"
+ And I logout
+
+ @javascript
+ Scenario: Viewing the public issue as a "John Doe"
+ Given I sign in as "John Doe"
+ When I visit issue page "Community fix"
+ Then I should see no notes at all
+
+ @javascript
+ Scenario: Viewing the public issue as "Mary Jane"
+ Given I sign in as "Mary Jane"
+ When I visit issue page "Community fix"
+ And I should see a note linking to "Enterprise fix" merge request
+ And I should see a note linking to "Enterprise issue" issue