summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-10-31 14:26:51 +0100
committerJames Lopez <james@jameslopez.es>2017-10-31 14:26:51 +0100
commit4bce563c6b66cffd87cd32921214148d4de541e0 (patch)
tree607e2f79258edd642374258732bbb13848ab5e1f
parentef8217fbeee55c02b6bab3a8b273f8ffeaa21f74 (diff)
downloadgitlab-ce-fix/import-issue-assignees.tar.gz
-rw-r--r--spec/lib/gitlab/import_export/project.json12
-rw-r--r--spec/lib/gitlab/import_export/project_tree_restorer_spec.rb2
-rw-r--r--spec/lib/gitlab/import_export/safe_model_attributes.yml3
3 files changed, 10 insertions, 7 deletions
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 4eb8afc08e3..9a68bbb379c 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -60,6 +60,12 @@
"due_date": null,
"moved_to_id": null,
"test_ee_field": "test",
+ "issue_assignees": [
+ {
+ "user_id": 1,
+ "issue_id": 1
+ }
+ ],
"milestone": {
"id": 1,
"title": "test milestone",
@@ -70,12 +76,6 @@
"updated_at": "2016-06-14T15:02:04.415Z",
"state": "active",
"iid": 1,
- "issue_assignees": [
- {
- "user_id": 1,
- "issue_id": 1
- }
- ]
"events": [
{
"id": 487,
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index a8eac318242..76b01b6a1ec 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -64,7 +64,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end
it 'has issue assignees' do
- expect(project.issues.where(title: 'Voluptatem').first.issue_assignees).not_to be_empty
+ expect(Issue.where(title: 'Voluptatem').first.issue_assignees).not_to be_empty
end
it 'contains the merge access levels on a protected branch' do
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 121c0ed04ed..89d30407077 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -506,3 +506,6 @@ ProjectAutoDevops:
- project_id
- created_at
- updated_at
+IssueAssignee:
+- user_id
+- issue_id \ No newline at end of file