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
2b9ec17e
Commit
2b9ec17e
authored
Jul 19, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Rubocop offenses
parent
9b584a59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
+16
-16
No files found.
spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
View file @
2b9ec17e
...
...
@@ -237,14 +237,14 @@ describe Gitlab::BitbucketServerImport::Importer do
it
'#restore_branches'
do
expect
(
subject
).
to
receive
(
:restore_branches
).
and_call_original
expect
(
subject
).
to
receive
(
:delete_temp_branches
)
expect
(
subject
.
client
).
to
receive
(
:create_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_from
,
'12345678'
)
expect
(
subject
.
client
).
to
receive
(
:create_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_to
,
'98765432'
)
expect
(
subject
.
client
).
to
receive
(
:create_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_from
,
'12345678'
)
expect
(
subject
.
client
).
to
receive
(
:create_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_to
,
'98765432'
)
expect
{
subject
.
execute
}.
to
change
{
MergeRequest
.
count
}.
by
(
1
)
end
...
...
@@ -252,14 +252,14 @@ describe Gitlab::BitbucketServerImport::Importer do
it
'#delete_temp_branches'
do
expect
(
subject
.
client
).
to
receive
(
:create_branch
).
twice
expect
(
subject
).
to
receive
(
:delete_temp_branches
).
and_call_original
expect
(
subject
.
client
).
to
receive
(
:delete_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_from
,
'12345678'
)
expect
(
subject
.
client
).
to
receive
(
:delete_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_to
,
'98765432'
)
expect
(
subject
.
client
).
to
receive
(
:delete_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_from
,
'12345678'
)
expect
(
subject
.
client
).
to
receive
(
:delete_branch
)
.
with
(
project_key
,
repo_slug
,
temp_branch_to
,
'98765432'
)
expect
(
project
.
repository
).
to
receive
(
:delete_branch
).
with
(
temp_branch_from
)
expect
(
project
.
repository
).
to
receive
(
:delete_branch
).
with
(
temp_branch_to
)
...
...
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