summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-27 21:27:59 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-27 21:27:59 +0000
commitf57bffc82a5aa00e6494c65565255dfc9434f403 (patch)
tree1186ff9ef33a6563d3bab8f593e1f9bb82b5fb4e /features
parentfc17b440f93e61879ef4881aeacbcbca27dcde1c (diff)
parente956066d4a9c3f556a52f80acfb5c761aede7c6c (diff)
downloadgitlab-ce-f57bffc82a5aa00e6494c65565255dfc9434f403.tar.gz
Merge branch 'init-from-ui' into 'master'
Add tests for creating bare repo and first file in UI Part of #1930 See merge request !1444
Diffstat (limited to 'features')
-rw-r--r--features/project/source/browse_files.feature13
-rw-r--r--features/steps/project/source/browse_files.rb11
-rw-r--r--features/steps/shared/project.rb4
3 files changed, 28 insertions, 0 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 6ea64f70092..ccb29293a89 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -35,6 +35,19 @@ Feature: Project Source Browse Files
And I should see its new content
@javascript
+ Scenario: I can create file in empty repo
+ Given I own an empty project
+ And I visit my empty project page
+ And I create bare repo
+ When I click on "add a file" link
+ And I edit code
+ And I fill the new file name
+ And I fill the commit message
+ And I click on "Commit Changes"
+ Then I am redirected to the new file
+ And I should see its new content
+
+ @javascript
Scenario: If I enter an illegal file name I see an error message
Given I click on "new file" link in repo
And I fill the new file name with an illegal name
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index bd1ca55a20a..770e8162497 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -166,6 +166,17 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
expect(page).to have_content('Your changes could not be committed')
end
+ step 'I create bare repo' do
+ click_link 'Create empty bare repository'
+ end
+
+ step 'I click on "add a file" link' do
+ click_link 'add a file'
+
+ # Remove pre-receive hook so we can push without auth
+ FileUtils.rm(File.join(Project.last.repository.path, 'hooks', 'pre-receive'))
+ end
+
private
def set_new_content
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 0bd5653538c..cf0be256231 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -28,6 +28,10 @@ module SharedProject
@project.team << [@user, :master]
end
+ step 'I visit my empty project page' do
+ visit project_path(Project.find_by(name: 'Empty Project'))
+ end
+
step 'project "Shop" has push event' do
@project = Project.find_by(name: "Shop")