summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-08-07 15:32:43 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-08-07 15:32:43 +0200
commitdb65499e26d6bc0c882f4855fe0e376bb1df3e6d (patch)
treebffe3e5853bf297fe3069afb68615eb5d392df9b
parent2e6aa4f25e14fa7e57ea9f271e302e291ecc9e05 (diff)
downloadgitlab-ce-db65499e26d6bc0c882f4855fe0e376bb1df3e6d.tar.gz
Fix last feature test for project templates
-rw-r--r--app/controllers/projects_controller.rb1
-rw-r--r--lib/tasks/gitlab/update_templates.rake3
-rw-r--r--spec/features/projects_spec.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 08219a5112e..0bffae6decd 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -26,7 +26,6 @@ class ProjectsController < Projects::ApplicationController
render 'edit'
end
-
def create
@project = ::Projects::CreateService.new(current_user, project_params).execute
diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake
index 17199c1871d..a7e30423c7a 100644
--- a/lib/tasks/gitlab/update_templates.rake
+++ b/lib/tasks/gitlab/update_templates.rake
@@ -40,8 +40,9 @@ namespace :gitlab do
end
puts "Waiting for the import to finish"
+
sleep(5)
- project = project.reload
+ project.reload
end
Projects::ImportExport::ExportService.new(project, admin).execute
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index c2ad3a25365..7e4d53332e5 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -11,14 +11,14 @@ feature 'Project' do
end
it "allows creation from templates" do
- fill_in("project_template_name", with: template.title)
+ page.choose(template.name)
fill_in("project_path", with: template.name)
page.within '#content-body' do
click_button "Create project"
end
- expect(page).to have_content 'Import in progress'
+ expect(page).to have_content 'This project Loading..'
end
end