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
2065a2d1
Commit
2065a2d1
authored
7 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attempt to fix random import file spec error
parent
a6f9470b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+8
-6
No files found.
spec/features/projects/import_export/import_file_spec.rb
View file @
2065a2d1
...
...
@@ -18,23 +18,25 @@ feature 'Import/Export - project import integration test', js: true do
context
'when selecting the namespace'
do
let
(
:user
)
{
create
(
:admin
)
}
let!
(
:namespace
)
{
create
(
:namespace
,
name:
"asd"
,
owner:
user
)
}
let!
(
:namespace
)
{
create
(
:namespace
,
name:
"asd"
+
SecureRandom
.
hex
,
path:
SecureRandom
.
hex
,
owner:
user
)
}
let
(
:project_path
)
{
'test-project-path'
+
SecureRandom
.
hex
}
context
'prefilled the path'
do
scenario
'user imports an exported project successfully'
do
visit
new_project_path
select2
(
namespace
.
id
,
from:
'#project_namespace_id'
)
fill_in
:project_path
,
with:
'test-project-path'
,
visible:
true
fill_in
:project_path
,
with:
project_path
,
visible:
true
click_link
'GitLab export'
expect
(
page
).
to
have_content
(
'Import an exported GitLab project'
)
expect
(
URI
.
parse
(
current_url
).
query
).
to
eq
(
"namespace_id=
#{
namespace
.
id
}
&path=
test-project-path
"
)
expect
(
Gitlab
::
ImportExport
).
to
receive
(
:import_upload_path
).
with
(
filename:
/\A\h{32}_test-project-path
\z/
).
and_call_original
expect
(
URI
.
parse
(
current_url
).
query
).
to
eq
(
"namespace_id=
#{
namespace
.
id
}
&path=
#{
project_path
}
"
)
#expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path#{project_path}
\z/).and_call_original
attach_file
(
'file'
,
file
)
click_on
'Import project'
expect
{
click_on
'Import project'
}.
to
change
{
Project
.
count
}.
by
(
1
)
expect
(
Project
.
count
).
to
eq
(
1
)
project
=
Project
.
last
expect
(
project
).
not_to
be_nil
...
...
@@ -64,7 +66,7 @@ feature 'Import/Export - project import integration test', js: true do
end
scenario
'invalid project'
do
namespace
=
create
(
:namespace
,
name:
"asd"
,
owner:
user
)
namespace
=
create
(
:namespace
,
name:
"asd"
+
SecureRandom
.
hex
,
owner:
user
)
project
=
create
(
:project
,
namespace:
namespace
)
visit
new_project_path
...
...
This diff is collapsed.
Click to expand it.
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