summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorliyakun <liyakun127@gmail.com>2015-09-10 16:18:40 +0200
committerliyakun <liyakun127@gmail.com>2015-09-15 02:12:56 +0200
commite2ece2bc350bf881e9716e51c01a59eecac65fc9 (patch)
tree422d043e1cd6bc09c62fd726958384c320c483d8 /features/project
parent7abb744eb961d95ef9f34e8b64c47084d3f620b6 (diff)
downloadgitlab-ce-e2ece2bc350bf881e9716e51c01a59eecac65fc9.tar.gz
Add "Replace" and "Upload" features
Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
Diffstat (limited to 'features/project')
-rw-r--r--features/project/source/browse_files.feature23
1 files changed, 23 insertions, 0 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index d3a77466a35..b5b6abe6aff 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -33,6 +33,29 @@ 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 upload a new text file
+ And I fill the upload file commit message
+ And I click on "Upload file"
+ Then I can see the new text file
+ And I can see the new commit message
+
+ @javascript
+ Scenario: I can replace file and commit
+ Given I click on ".gitignore" file in repo
+ And I see the ".gitignore"
+ And I click on "Replace"
+ And I replace it with a text file
+ And I fill the replace file commit message
+ And I click on "Replace file"
+ Then I can see the new text file
+ And I can see the replacement commit message
@javascript
Scenario: I can create and commit file and specify new branch