diff options
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/issues/issues.feature | 6 | ||||
| -rw-r--r-- | features/project/merge_requests/revert.feature | 2 | ||||
| -rw-r--r-- | features/project/source/browse_files.feature | 6 | ||||
| -rw-r--r-- | features/project/team_management.feature | 20 |
4 files changed, 5 insertions, 29 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 27fa67c1843..4dee0cd23dc 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -177,9 +177,3 @@ Feature: Project Issues And I should not see labels field And I submit new issue "500 error on profile" Then I should see issue "500 error on profile" - - @javascript - Scenario: Another user adds a comment to issue I'm currently viewing - Given I visit issue page "Release 0.4" - And another user adds a comment with text "Yay!" to issue "Release 0.4" - Then I should see a new comment with text "Yay!" diff --git a/features/project/merge_requests/revert.feature b/features/project/merge_requests/revert.feature index ec6666f227f..aaac5fd7209 100644 --- a/features/project/merge_requests/revert.feature +++ b/features/project/merge_requests/revert.feature @@ -25,7 +25,5 @@ Feature: Revert Merge Requests @javascript Scenario: I revert a merge request in a new merge request Given I click on the revert button - And I am on the Merge Request detail page - And I click on the revert button And I revert the changes in a new merge request Then I should see the new merge request notice diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index 894c4a96bb8..d81bc9802bc 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -117,6 +117,8 @@ Feature: Project Source Browse Files And I click on ".gitignore" file in repo And I see the ".gitignore" And I click on "Replace" + Then I should see a Fork/Cancel combo + And I click button "Fork" Then I should see a notice about a new fork having been created When I click on "Replace" And I replace it with a text file @@ -135,7 +137,7 @@ Feature: Project Source Browse Files And I fill the commit message And I click on "Commit changes" Then I am on the new file page - And I see a commit error message + And I see "Path can contain only..." @javascript Scenario: I can create file with a directory name @@ -265,6 +267,8 @@ Feature: Project Source Browse Files And I click on ".gitignore" file in repo And I see the ".gitignore" And I click on "Delete" + Then I should see a Fork/Cancel combo + And I click button "Fork" Then I should see a notice about a new fork having been created When I click on "Delete" And I fill the commit message diff --git a/features/project/team_management.feature b/features/project/team_management.feature index 5888662fc3f..aed41924cd9 100644 --- a/features/project/team_management.feature +++ b/features/project/team_management.feature @@ -7,26 +7,6 @@ Feature: Project Team Management And "Dmitriy" is "Shop" developer And I visit project "Shop" team page - Scenario: See all team members - Then I should be able to see myself in team - And I should see "Dmitriy" in team list - - @javascript - Scenario: Add user to project - When I select "Mike" as "Reporter" - Then I should see "Mike" in team list as "Reporter" - - @javascript - Scenario: Invite user to project - When I select "sjobs@apple.com" as "Reporter" - Then I should see "sjobs@apple.com" in team list as invited "Reporter" - - @javascript - Scenario: Update user access - Given I should see "Dmitriy" in team list as "Developer" - And I change "Dmitriy" role to "Reporter" - And I should see "Dmitriy" in team list as "Reporter" - Scenario: Cancel team member Given I click cancel link for "Dmitriy" Then I visit project "Shop" team page |