diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-04-10 23:51:24 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-04-20 21:34:18 +0300 |
| commit | 36387ce1b4a687a41f450c9fcccc348e478ca296 (patch) | |
| tree | f22ef9dcfaef98e2bd643d63ec5e06fa46d28cfd /features | |
| parent | 60a6389a7223f14156aeeec9a3854f8ea88de1f0 (diff) | |
Add Fork/Cancel confirmation to "Replace"/"Delete" buttons
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/source/browse_files.feature | 4 | ||||
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index 536c24b6882..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 @@ -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/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index d52fa10c337..f5e8f7a7c32 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -377,7 +377,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps step 'I should see a Fork/Cancel combo' do expect(page).to have_link 'Fork' expect(page).to have_button 'Cancel' - expect(page).to have_content 'You don\'t have permission to edit this file. Try forking this project to edit the file.' end step 'I should see a notice about a new fork having been created' do |