Merge branch 'gh-import-milestones' into 'master'
Import milestones from GitHub Closes #13421 See merge request !3797
This commit is contained in:
commit
53a1d705fe
|
@ -86,6 +86,7 @@ v 8.7.0 (unreleased)
|
|||
- Updated print style for issues
|
||||
- Use GitHub Issue/PR number as iid to keep references
|
||||
- Import GitHub labels
|
||||
- Import GitHub milestones
|
||||
|
||||
v 8.6.6
|
||||
- Expire the exists cache before deletion to ensure project dir actually exists (Stan Hu). !3413
|
||||
|
|
|
@ -16,7 +16,8 @@ module Gitlab
|
|||
end
|
||||
|
||||
def execute
|
||||
import_labels && import_issues && import_pull_requests && import_wiki
|
||||
import_labels && import_milestones && import_issues &&
|
||||
import_pull_requests && import_wiki
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -35,6 +36,16 @@ module Gitlab
|
|||
raise Projects::ImportService::Error, e.message
|
||||
end
|
||||
|
||||
def import_milestones
|
||||
client.list_milestones(project.import_source, state: :all).each do |raw_data|
|
||||
Milestone.create!(MilestoneFormatter.new(project, raw_data).attributes)
|
||||
end
|
||||
|
||||
true
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
raise Projects::ImportService::Error, e.message
|
||||
end
|
||||
|
||||
def import_issues
|
||||
client.list_issues(project.import_source, state: :all,
|
||||
sort: :created,
|
||||
|
|
|
@ -5,6 +5,7 @@ module Gitlab
|
|||
{
|
||||
iid: number,
|
||||
project: project,
|
||||
milestone: milestone,
|
||||
title: raw_data.title,
|
||||
description: description,
|
||||
state: state,
|
||||
|
@ -55,6 +56,12 @@ module Gitlab
|
|||
@formatter.author_line(author) + body
|
||||
end
|
||||
|
||||
def milestone
|
||||
if raw_data.milestone.present?
|
||||
project.milestones.find_by(iid: raw_data.milestone.number)
|
||||
end
|
||||
end
|
||||
|
||||
def state
|
||||
raw_data.state == 'closed' ? 'closed' : 'opened'
|
||||
end
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
module Gitlab
|
||||
module GithubImport
|
||||
class MilestoneFormatter < BaseFormatter
|
||||
def attributes
|
||||
{
|
||||
iid: number,
|
||||
project: project,
|
||||
title: title,
|
||||
description: description,
|
||||
due_date: due_date,
|
||||
state: state,
|
||||
created_at: created_at,
|
||||
updated_at: updated_at
|
||||
}
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def number
|
||||
raw_data.number
|
||||
end
|
||||
|
||||
def title
|
||||
raw_data.title
|
||||
end
|
||||
|
||||
def description
|
||||
raw_data.description
|
||||
end
|
||||
|
||||
def due_date
|
||||
raw_data.due_on
|
||||
end
|
||||
|
||||
def state
|
||||
raw_data.state == 'closed' ? 'closed' : 'active'
|
||||
end
|
||||
|
||||
def created_at
|
||||
raw_data.created_at
|
||||
end
|
||||
|
||||
def updated_at
|
||||
state == 'closed' ? raw_data.closed_at : raw_data.updated_at
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -11,6 +11,7 @@ module Gitlab
|
|||
target_project: target_project,
|
||||
target_branch: target_branch.name,
|
||||
state: state,
|
||||
milestone: milestone,
|
||||
author_id: author_id,
|
||||
assignee_id: assignee_id,
|
||||
created_at: raw_data.created_at,
|
||||
|
@ -58,6 +59,12 @@ module Gitlab
|
|||
formatter.author_line(author) + body
|
||||
end
|
||||
|
||||
def milestone
|
||||
if raw_data.milestone.present?
|
||||
project.milestones.find_by(iid: raw_data.milestone.number)
|
||||
end
|
||||
end
|
||||
|
||||
def source_project
|
||||
project
|
||||
end
|
||||
|
|
|
@ -2,13 +2,14 @@ require 'spec_helper'
|
|||
|
||||
describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
||||
let!(:project) { create(:project, namespace: create(:namespace, path: 'octocat')) }
|
||||
let(:octocat) { OpenStruct.new(id: 123456, login: 'octocat') }
|
||||
let(:octocat) { double(id: 123456, login: 'octocat') }
|
||||
let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
|
||||
let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
|
||||
|
||||
let(:base_data) do
|
||||
{
|
||||
number: 1347,
|
||||
milestone: nil,
|
||||
state: 'open',
|
||||
title: 'Found a bug',
|
||||
body: "I'm having a problem with this.",
|
||||
|
@ -26,12 +27,13 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
|
||||
describe '#attributes' do
|
||||
context 'when issue is open' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(state: 'open')) }
|
||||
let(:raw_data) { double(base_data.merge(state: 'open')) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
iid: 1347,
|
||||
project: project,
|
||||
milestone: nil,
|
||||
title: 'Found a bug',
|
||||
description: "*Created by: octocat*\n\nI'm having a problem with this.",
|
||||
state: 'opened',
|
||||
|
@ -47,12 +49,13 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
|
||||
context 'when issue is closed' do
|
||||
let(:closed_at) { DateTime.strptime('2011-01-28T19:01:12Z') }
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(state: 'closed', closed_at: closed_at)) }
|
||||
let(:raw_data) { double(base_data.merge(state: 'closed', closed_at: closed_at)) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
iid: 1347,
|
||||
project: project,
|
||||
milestone: nil,
|
||||
title: 'Found a bug',
|
||||
description: "*Created by: octocat*\n\nI'm having a problem with this.",
|
||||
state: 'closed',
|
||||
|
@ -67,7 +70,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when it is assigned to someone' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(assignee: octocat)) }
|
||||
let(:raw_data) { double(base_data.merge(assignee: octocat)) }
|
||||
|
||||
it 'returns nil as assignee_id when is not a GitLab user' do
|
||||
expect(issue.attributes.fetch(:assignee_id)).to be_nil
|
||||
|
@ -80,8 +83,23 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when it has a milestone' do
|
||||
let(:milestone) { double(number: 45) }
|
||||
let(:raw_data) { double(base_data.merge(milestone: milestone)) }
|
||||
|
||||
it 'returns nil when milestone does not exist' do
|
||||
expect(issue.attributes.fetch(:milestone)).to be_nil
|
||||
end
|
||||
|
||||
it 'returns milestone when it exists' do
|
||||
milestone = create(:milestone, project: project, iid: 45)
|
||||
|
||||
expect(issue.attributes.fetch(:milestone)).to eq milestone
|
||||
end
|
||||
end
|
||||
|
||||
context 'when author is a GitLab user' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(user: octocat)) }
|
||||
let(:raw_data) { double(base_data.merge(user: octocat)) }
|
||||
|
||||
it 'returns project#creator_id as author_id when is not a GitLab user' do
|
||||
expect(issue.attributes.fetch(:author_id)).to eq project.creator_id
|
||||
|
@ -97,7 +115,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
|
||||
describe '#has_comments?' do
|
||||
context 'when number of comments is greater than zero' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(comments: 1)) }
|
||||
let(:raw_data) { double(base_data.merge(comments: 1)) }
|
||||
|
||||
it 'returns true' do
|
||||
expect(issue.has_comments?).to eq true
|
||||
|
@ -105,7 +123,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when number of comments is equal to zero' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(comments: 0)) }
|
||||
let(:raw_data) { double(base_data.merge(comments: 0)) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(issue.has_comments?).to eq false
|
||||
|
@ -114,7 +132,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
end
|
||||
|
||||
describe '#number' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(number: 1347)) }
|
||||
let(:raw_data) { double(base_data.merge(number: 1347)) }
|
||||
|
||||
it 'returns pull request number' do
|
||||
expect(issue.number).to eq 1347
|
||||
|
@ -123,7 +141,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
|
||||
describe '#valid?' do
|
||||
context 'when mention a pull request' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(pull_request: OpenStruct.new)) }
|
||||
let(:raw_data) { double(base_data.merge(pull_request: double)) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(issue.valid?).to eq false
|
||||
|
@ -131,7 +149,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when does not mention a pull request' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(pull_request: nil)) }
|
||||
let(:raw_data) { double(base_data.merge(pull_request: nil)) }
|
||||
|
||||
it 'returns true' do
|
||||
expect(issue.valid?).to eq true
|
||||
|
|
|
@ -0,0 +1,82 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
|
||||
let(:project) { create(:empty_project) }
|
||||
let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
|
||||
let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
|
||||
let(:base_data) do
|
||||
{
|
||||
number: 1347,
|
||||
state: 'open',
|
||||
title: '1.0',
|
||||
description: 'Version 1.0',
|
||||
due_on: nil,
|
||||
created_at: created_at,
|
||||
updated_at: updated_at,
|
||||
closed_at: nil
|
||||
}
|
||||
end
|
||||
|
||||
subject(:formatter) { described_class.new(project, raw_data)}
|
||||
|
||||
describe '#attributes' do
|
||||
context 'when milestone is open' do
|
||||
let(:raw_data) { double(base_data.merge(state: 'open')) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
iid: 1347,
|
||||
project: project,
|
||||
title: '1.0',
|
||||
description: 'Version 1.0',
|
||||
state: 'active',
|
||||
due_date: nil,
|
||||
created_at: created_at,
|
||||
updated_at: updated_at
|
||||
}
|
||||
|
||||
expect(formatter.attributes).to eq(expected)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when milestone is closed' do
|
||||
let(:closed_at) { DateTime.strptime('2011-01-28T19:01:12Z') }
|
||||
let(:raw_data) { double(base_data.merge(state: 'closed', closed_at: closed_at)) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
iid: 1347,
|
||||
project: project,
|
||||
title: '1.0',
|
||||
description: 'Version 1.0',
|
||||
state: 'closed',
|
||||
due_date: nil,
|
||||
created_at: created_at,
|
||||
updated_at: closed_at
|
||||
}
|
||||
|
||||
expect(formatter.attributes).to eq(expected)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when milestone has a due date' do
|
||||
let(:due_date) { DateTime.strptime('2011-01-28T19:01:12Z') }
|
||||
let(:raw_data) { double(base_data.merge(due_on: due_date)) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
iid: 1347,
|
||||
project: project,
|
||||
title: '1.0',
|
||||
description: 'Version 1.0',
|
||||
state: 'active',
|
||||
due_date: due_date,
|
||||
created_at: created_at,
|
||||
updated_at: updated_at
|
||||
}
|
||||
|
||||
expect(formatter.attributes).to eq(expected)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -2,17 +2,18 @@ require 'spec_helper'
|
|||
|
||||
describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
||||
let(:project) { create(:project) }
|
||||
let(:repository) { OpenStruct.new(id: 1, fork: false) }
|
||||
let(:repository) { double(id: 1, fork: false) }
|
||||
let(:source_repo) { repository }
|
||||
let(:source_branch) { OpenStruct.new(ref: 'feature', repo: source_repo) }
|
||||
let(:source_branch) { double(ref: 'feature', repo: source_repo) }
|
||||
let(:target_repo) { repository }
|
||||
let(:target_branch) { OpenStruct.new(ref: 'master', repo: target_repo) }
|
||||
let(:octocat) { OpenStruct.new(id: 123456, login: 'octocat') }
|
||||
let(:target_branch) { double(ref: 'master', repo: target_repo) }
|
||||
let(:octocat) { double(id: 123456, login: 'octocat') }
|
||||
let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
|
||||
let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
|
||||
let(:base_data) do
|
||||
{
|
||||
number: 1347,
|
||||
milestone: nil,
|
||||
state: 'open',
|
||||
title: 'New feature',
|
||||
body: 'Please pull these awesome changes',
|
||||
|
@ -31,7 +32,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
|
||||
describe '#attributes' do
|
||||
context 'when pull request is open' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(state: 'open')) }
|
||||
let(:raw_data) { double(base_data.merge(state: 'open')) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
|
@ -43,6 +44,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
target_project: project,
|
||||
target_branch: 'master',
|
||||
state: 'opened',
|
||||
milestone: nil,
|
||||
author_id: project.creator_id,
|
||||
assignee_id: nil,
|
||||
created_at: created_at,
|
||||
|
@ -55,7 +57,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
|
||||
context 'when pull request is closed' do
|
||||
let(:closed_at) { DateTime.strptime('2011-01-28T19:01:12Z') }
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(state: 'closed', closed_at: closed_at)) }
|
||||
let(:raw_data) { double(base_data.merge(state: 'closed', closed_at: closed_at)) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
|
@ -67,6 +69,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
target_project: project,
|
||||
target_branch: 'master',
|
||||
state: 'closed',
|
||||
milestone: nil,
|
||||
author_id: project.creator_id,
|
||||
assignee_id: nil,
|
||||
created_at: created_at,
|
||||
|
@ -79,7 +82,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
|
||||
context 'when pull request is merged' do
|
||||
let(:merged_at) { DateTime.strptime('2011-01-28T13:01:12Z') }
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(state: 'closed', merged_at: merged_at)) }
|
||||
let(:raw_data) { double(base_data.merge(state: 'closed', merged_at: merged_at)) }
|
||||
|
||||
it 'returns formatted attributes' do
|
||||
expected = {
|
||||
|
@ -91,6 +94,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
target_project: project,
|
||||
target_branch: 'master',
|
||||
state: 'merged',
|
||||
milestone: nil,
|
||||
author_id: project.creator_id,
|
||||
assignee_id: nil,
|
||||
created_at: created_at,
|
||||
|
@ -102,7 +106,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when it is assigned to someone' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(assignee: octocat)) }
|
||||
let(:raw_data) { double(base_data.merge(assignee: octocat)) }
|
||||
|
||||
it 'returns nil as assignee_id when is not a GitLab user' do
|
||||
expect(pull_request.attributes.fetch(:assignee_id)).to be_nil
|
||||
|
@ -116,7 +120,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when author is a GitLab user' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(user: octocat)) }
|
||||
let(:raw_data) { double(base_data.merge(user: octocat)) }
|
||||
|
||||
it 'returns project#creator_id as author_id when is not a GitLab user' do
|
||||
expect(pull_request.attributes.fetch(:author_id)).to eq project.creator_id
|
||||
|
@ -128,10 +132,25 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
expect(pull_request.attributes.fetch(:author_id)).to eq gl_user.id
|
||||
end
|
||||
end
|
||||
|
||||
context 'when it has a milestone' do
|
||||
let(:milestone) { double(number: 45) }
|
||||
let(:raw_data) { double(base_data.merge(milestone: milestone)) }
|
||||
|
||||
it 'returns nil when milestone does not exists' do
|
||||
expect(pull_request.attributes.fetch(:milestone)).to be_nil
|
||||
end
|
||||
|
||||
it 'returns milestone when is exists' do
|
||||
milestone = create(:milestone, project: project, iid: 45)
|
||||
|
||||
expect(pull_request.attributes.fetch(:milestone)).to eq milestone
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#number' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(number: 1347)) }
|
||||
let(:raw_data) { double(base_data.merge(number: 1347)) }
|
||||
|
||||
it 'returns pull request number' do
|
||||
expect(pull_request.number).to eq 1347
|
||||
|
@ -139,11 +158,11 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
describe '#valid?' do
|
||||
let(:invalid_branch) { OpenStruct.new(ref: 'invalid-branch') }
|
||||
let(:invalid_branch) { double(ref: 'invalid-branch').as_null_object }
|
||||
|
||||
context 'when source, and target repositories are the same' do
|
||||
context 'and source and target branches exists' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(head: source_branch, base: target_branch)) }
|
||||
let(:raw_data) { double(base_data.merge(head: source_branch, base: target_branch)) }
|
||||
|
||||
it 'returns true' do
|
||||
expect(pull_request.valid?).to eq true
|
||||
|
@ -151,7 +170,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'and source branch doesn not exists' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(head: invalid_branch, base: target_branch)) }
|
||||
let(:raw_data) { double(base_data.merge(head: invalid_branch, base: target_branch)) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(pull_request.valid?).to eq false
|
||||
|
@ -159,7 +178,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'and target branch doesn not exists' do
|
||||
let(:raw_data) { OpenStruct.new(base_data.merge(head: source_branch, base: invalid_branch)) }
|
||||
let(:raw_data) { double(base_data.merge(head: source_branch, base: invalid_branch)) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(pull_request.valid?).to eq false
|
||||
|
@ -168,8 +187,8 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when source repo is a fork' do
|
||||
let(:source_repo) { OpenStruct.new(id: 2, fork: true) }
|
||||
let(:raw_data) { OpenStruct.new(base_data) }
|
||||
let(:source_repo) { double(id: 2, fork: true) }
|
||||
let(:raw_data) { double(base_data) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(pull_request.valid?).to eq false
|
||||
|
@ -177,8 +196,8 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
|
|||
end
|
||||
|
||||
context 'when target repo is a fork' do
|
||||
let(:target_repo) { OpenStruct.new(id: 2, fork: true) }
|
||||
let(:raw_data) { OpenStruct.new(base_data) }
|
||||
let(:target_repo) { double(id: 2, fork: true) }
|
||||
let(:raw_data) { double(base_data) }
|
||||
|
||||
it 'returns false' do
|
||||
expect(pull_request.valid?).to eq false
|
||||
|
|
Loading…
Reference in New Issue