diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-20 00:37:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-20 00:37:44 +0000 |
| commit | d170133bded904603833f1b9e2727def3805962d (patch) | |
| tree | a1c1e1f9973b43a5ff2482d4e1b91b219c5ac3af /features | |
| parent | bfb635a4afea60751a44e6454f9c36850b5342c9 (diff) | |
| download | gitlab-ce-d170133bded904603833f1b9e2727def3805962d.tar.gz | |
Refactor changing files in web UI
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/merge_requests/revert.feature | 2 | ||||
| -rw-r--r-- | features/project/source/browse_files.feature | 2 | ||||
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 6 |
3 files changed, 6 insertions, 4 deletions
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..536c24b6882 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -135,7 +135,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 diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 5bd3c1a1246..d52fa10c337 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -284,7 +284,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps end step 'I see "Unable to create directory"' do - expect(page).to have_content('Directory already exists') + expect(page).to have_content('A directory with this name already exists') + end + + step 'I see "Path can contain only..."' do + expect(page).to have_content('Path can contain only') end step 'I see a commit error message' do |