diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
| commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
| tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /spec/lib/gitlab/github_import | |
| parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/github_import')
| -rw-r--r-- | spec/lib/gitlab/github_import/importer/issue_importer_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb index a003ad7e091..0f2ba99f816 100644 --- a/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb @@ -99,7 +99,6 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach project_id: project.id, description: 'This is my issue', milestone_id: milestone.id, - state: :opened, state_id: 1, created_at: created_at, updated_at: updated_at @@ -129,7 +128,6 @@ describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cach project_id: project.id, description: "*Created by: alice*\n\nThis is my issue", milestone_id: milestone.id, - state: :opened, state_id: 1, created_at: created_at, updated_at: updated_at diff --git a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb index 50c27e7f4b7..30d23fcf9d4 100644 --- a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb @@ -94,7 +94,6 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi target_project_id: project.id, source_branch: 'github/fork/alice/feature', target_branch: 'master', - state: :merged, state_id: 3, milestone_id: milestone.id, author_id: user.id, @@ -140,7 +139,6 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi target_project_id: project.id, source_branch: 'github/fork/alice/feature', target_branch: 'master', - state: :merged, state_id: 3, milestone_id: milestone.id, author_id: project.creator_id, @@ -187,7 +185,6 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi target_project_id: project.id, source_branch: 'master-42', target_branch: 'master', - state: :merged, state_id: 3, milestone_id: milestone.id, author_id: user.id, |