Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
db65499e
Commit
db65499e
authored
Aug 07, 2017
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix last feature test for project templates
parent
2e6aa4f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+0
-1
lib/tasks/gitlab/update_templates.rake
lib/tasks/gitlab/update_templates.rake
+2
-1
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+2
-2
No files found.
app/controllers/projects_controller.rb
View file @
db65499e
...
@@ -26,7 +26,6 @@ class ProjectsController < Projects::ApplicationController
...
@@ -26,7 +26,6 @@ class ProjectsController < Projects::ApplicationController
render
'edit'
render
'edit'
end
end
def
create
def
create
@project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project_params
).
execute
@project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project_params
).
execute
...
...
lib/tasks/gitlab/update_templates.rake
View file @
db65499e
...
@@ -40,8 +40,9 @@ namespace :gitlab do
...
@@ -40,8 +40,9 @@ namespace :gitlab do
end
end
puts
"Waiting for the import to finish"
puts
"Waiting for the import to finish"
sleep
(
5
)
sleep
(
5
)
project
=
project
.
reload
project
.
reload
end
end
Projects
::
ImportExport
::
ExportService
.
new
(
project
,
admin
).
execute
Projects
::
ImportExport
::
ExportService
.
new
(
project
,
admin
).
execute
...
...
spec/features/projects_spec.rb
View file @
db65499e
...
@@ -11,14 +11,14 @@ feature 'Project' do
...
@@ -11,14 +11,14 @@ feature 'Project' do
end
end
it
"allows creation from templates"
do
it
"allows creation from templates"
do
fill_in
(
"project_template_name"
,
with:
template
.
titl
e
)
page
.
choose
(
template
.
nam
e
)
fill_in
(
"project_path"
,
with:
template
.
name
)
fill_in
(
"project_path"
,
with:
template
.
name
)
page
.
within
'#content-body'
do
page
.
within
'#content-body'
do
click_button
"Create project"
click_button
"Create project"
end
end
expect
(
page
).
to
have_content
'
Import in progress
'
expect
(
page
).
to
have_content
'
This project Loading..
'
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment