diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 06:10:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 06:10:38 +0300 |
| commit | f24e50f0a55e872a2947ccb1af166b14883511b2 (patch) | |
| tree | 0db04f6f1b893439887ee21b18a0ea027b5f62e6 /spec/workers/gitlab/github_import | |
| parent | 5ee9033e9db11ce04f5cc6d7bda32f8059a1f405 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/gitlab/github_import')
4 files changed, 4 insertions, 0 deletions
diff --git a/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb b/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb index 4039cdac721..6476d82eb85 100644 --- a/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb @@ -12,6 +12,7 @@ RSpec.describe Gitlab::GithubImport::ImportDiffNoteWorker do importer = double(:importer) hash = { 'noteable_id' => 42, + 'github_id' => 42, 'path' => 'README.md', 'commit_id' => '123abc', 'diff_hunk' => "@@ -1 +1 @@\n-Hello\n+Hello world", diff --git a/spec/workers/gitlab/github_import/import_issue_worker_spec.rb b/spec/workers/gitlab/github_import/import_issue_worker_spec.rb index c25e89f6928..9f5bd1d9e5e 100644 --- a/spec/workers/gitlab/github_import/import_issue_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_issue_worker_spec.rb @@ -12,6 +12,7 @@ RSpec.describe Gitlab::GithubImport::ImportIssueWorker do importer = double(:importer) hash = { 'iid' => 42, + 'github_id' => 42, 'title' => 'My Issue', 'description' => 'This is my issue', 'milestone_number' => 4, diff --git a/spec/workers/gitlab/github_import/import_note_worker_spec.rb b/spec/workers/gitlab/github_import/import_note_worker_spec.rb index bfb40d7c3d3..94bc8e26e4a 100644 --- a/spec/workers/gitlab/github_import/import_note_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_note_worker_spec.rb @@ -12,6 +12,7 @@ RSpec.describe Gitlab::GithubImport::ImportNoteWorker do importer = double(:importer) hash = { 'noteable_id' => 42, + 'github_id' => 42, 'noteable_type' => 'issues', 'user' => { 'id' => 4, 'login' => 'alice' }, 'note' => 'Hello world', diff --git a/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb b/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb index 12b21abf910..1238929fbcb 100644 --- a/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb @@ -12,6 +12,7 @@ RSpec.describe Gitlab::GithubImport::ImportPullRequestWorker do importer = double(:importer) hash = { 'iid' => 42, + 'github_id' => 42, 'title' => 'My Pull Request', 'description' => 'This is my pull request', 'source_branch' => 'my-feature', |