Merge branch 'master' into notification-levels

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..58574166ef3 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -35,6 +35,29 @@ Feature: Project Source Browse Files
     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 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"
+    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
     Given I click on "new file" link in repo
     And I edit code