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
56a41ceb
Commit
56a41ceb
authored
Feb 09, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve failures in GitHub-ish import controller specs
parent
06e9faa3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
spec/support/controllers/githubish_import_controller_shared_examples.rb
...ontrollers/githubish_import_controller_shared_examples.rb
+4
-4
No files found.
spec/support/controllers/githubish_import_controller_shared_examples.rb
View file @
56a41ceb
...
@@ -333,7 +333,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
...
@@ -333,7 +333,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
it
'does not create a new namespace under the user namespace'
do
it
'does not create a new namespace under the user namespace'
do
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
user
.
namespace
,
user
,
access_params
,
type:
provider
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
user
.
namespace
,
user
,
access_params
,
type:
provider
)
.
and_return
(
double
(
execute:
true
))
.
and_return
(
double
(
execute:
build_stubbed
(
:project
)
))
expect
{
post
:create
,
{
target_namespace:
"
#{
user
.
namespace_path
}
/test_group"
,
new_name:
test_name
,
format: :js
}
}
expect
{
post
:create
,
{
target_namespace:
"
#{
user
.
namespace_path
}
/test_group"
,
new_name:
test_name
,
format: :js
}
}
.
not_to
change
{
Namespace
.
count
}
.
not_to
change
{
Namespace
.
count
}
...
@@ -347,7 +347,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
...
@@ -347,7 +347,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
it
'does not take the selected namespace and name'
do
it
'does not take the selected namespace and name'
do
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
user
.
namespace
,
user
,
access_params
,
type:
provider
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
user
.
namespace
,
user
,
access_params
,
type:
provider
)
.
and_return
(
double
(
execute:
true
))
.
and_return
(
double
(
execute:
build_stubbed
(
:project
)
))
post
:create
,
{
target_namespace:
'foo/foobar/bar'
,
new_name:
test_name
,
format: :js
}
post
:create
,
{
target_namespace:
'foo/foobar/bar'
,
new_name:
test_name
,
format: :js
}
end
end
...
@@ -355,7 +355,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
...
@@ -355,7 +355,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
it
'does not create the namespaces'
do
it
'does not create the namespaces'
do
allow
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
allow
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
kind_of
(
Namespace
),
user
,
access_params
,
type:
provider
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
kind_of
(
Namespace
),
user
,
access_params
,
type:
provider
)
.
and_return
(
double
(
execute:
true
))
.
and_return
(
double
(
execute:
build_stubbed
(
:project
)
))
expect
{
post
:create
,
{
target_namespace:
'foo/foobar/bar'
,
new_name:
test_name
,
format: :js
}
}
expect
{
post
:create
,
{
target_namespace:
'foo/foobar/bar'
,
new_name:
test_name
,
format: :js
}
}
.
not_to
change
{
Namespace
.
count
}
.
not_to
change
{
Namespace
.
count
}
...
@@ -372,7 +372,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
...
@@ -372,7 +372,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
expect
(
Gitlab
::
LegacyGithubImport
::
ProjectCreator
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
group
,
user
,
access_params
,
type:
provider
)
.
to
receive
(
:new
).
with
(
provider_repo
,
test_name
,
group
,
user
,
access_params
,
type:
provider
)
.
and_return
(
double
(
execute:
true
))
.
and_return
(
double
(
execute:
build_stubbed
(
:project
)
))
post
:create
,
{
target_namespace:
'foo'
,
new_name:
test_name
,
format: :js
}
post
:create
,
{
target_namespace:
'foo'
,
new_name:
test_name
,
format: :js
}
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