summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-15 06:58:49 -0700
committerStan Hu <stanhu@gmail.com>2015-09-15 13:07:32 -0700
commitd9af6f79ed439308d13f44a0cfade6a355607f14 (patch)
tree99ea6028fee1cf0b506fc9aacd810daa1ad1b326 /features/project
parent0a8ef29b3d2504ba66cd0a98992c1f5f70b11daa (diff)
downloadgitlab-ce-d9af6f79ed439308d13f44a0cfade6a355607f14.tar.gz
Change the replace placeholder to use the filenamefix-upload-ui
Dynamically adjust placedholder for uploads and fix Dropzone event handlers Override error handler to prevent error messages from being inserted underneath image preview Fix tests Use regexp instead of startsWith for better browser compatibility Remove duplicate code in _replace.html.haml and use one template Remove files upon error and retain alert messages until user adds a new file
Diffstat (limited to 'features/project')
-rw-r--r--features/project/source/browse_files.feature6
1 files changed, 3 insertions, 3 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index b5b6abe6aff..58574166ef3 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -33,13 +33,13 @@ Feature: Project Source Browse Files
And I click on "Commit Changes"
Then I am redirected to the new file
And I should see its new content
-
+
@javascript
Scenario: I can upload file and commit
Given I click on "new file" link in repo
Then I can see new file page
- And I can see "upload existing one"
- And I click on "upload existing one"
+ And I can see "upload an existing one"
+ And I click on "upload"
And I upload a new text file
And I fill the upload file commit message
And I click on "Upload file"