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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b78a69b0
Commit
b78a69b0
authored
Jul 31, 2018
by
Andreas Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Trigger iid logic from GitHub importer for issues.
parent
a2d647b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
lib/gitlab/github_import/importer/issue_importer.rb
lib/gitlab/github_import/importer/issue_importer.rb
+5
-1
spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
.../lib/gitlab/github_import/importer/issue_importer_spec.rb
+22
-0
No files found.
lib/gitlab/github_import/importer/issue_importer.rb
View file @
b78a69b0
...
@@ -55,7 +55,11 @@ module Gitlab
...
@@ -55,7 +55,11 @@ module Gitlab
updated_at:
issue
.
updated_at
updated_at:
issue
.
updated_at
}
}
GithubImport
.
insert_and_return_id
(
attributes
,
project
.
issues
)
GithubImport
.
insert_and_return_id
(
attributes
,
project
.
issues
).
tap
do
|
id
|
# We use .insert_and_return_id which effectively disables all callbacks.
# Trigger iid logic here to make sure we track internal id values consistently.
project
.
issues
.
find
(
id
).
ensure_project_iid!
end
rescue
ActiveRecord
::
InvalidForeignKey
rescue
ActiveRecord
::
InvalidForeignKey
# It's possible the project has been deleted since scheduling this
# It's possible the project has been deleted since scheduling this
# job. In this case we'll just skip creating the issue.
# job. In this case we'll just skip creating the issue.
...
...
spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
View file @
b78a69b0
...
@@ -78,6 +78,11 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach
...
@@ -78,6 +78,11 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach
.
to
receive
(
:id_for
)
.
to
receive
(
:id_for
)
.
with
(
issue
)
.
with
(
issue
)
.
and_return
(
milestone
.
id
)
.
and_return
(
milestone
.
id
)
allow
(
importer
.
user_finder
)
.
to
receive
(
:author_id_for
)
.
with
(
issue
)
.
and_return
([
user
.
id
,
true
])
end
end
context
'when the issue author could be found'
do
context
'when the issue author could be found'
do
...
@@ -172,6 +177,23 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach
...
@@ -172,6 +177,23 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach
expect
(
importer
.
create_issue
).
to
be_a_kind_of
(
Numeric
)
expect
(
importer
.
create_issue
).
to
be_a_kind_of
(
Numeric
)
end
end
it
'triggers internal_id functionality to track greatest iids'
do
allow
(
importer
.
user_finder
)
.
to
receive
(
:author_id_for
)
.
with
(
issue
)
.
and_return
([
user
.
id
,
true
])
issue
=
build_stubbed
(
:issue
,
project:
project
)
allow
(
Gitlab
::
GithubImport
)
.
to
receive
(
:insert_and_return_id
)
.
and_return
(
issue
.
id
)
allow
(
project
.
issues
).
to
receive
(
:find
).
with
(
issue
.
id
).
and_return
(
issue
)
expect
(
issue
).
to
receive
(
:ensure_project_iid!
)
importer
.
create_issue
end
end
end
describe
'#create_assignees'
do
describe
'#create_assignees'
do
...
...
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