summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-12-19 11:26:57 +0100
committerJames Lopez <james@jameslopez.es>2016-12-19 11:26:57 +0100
commitd6edecdeec9b41b4509775ae5b2e01ee15b6d9dc (patch)
tree0bfbaec46907dd93d82ecce1f6416335454a0fc4 /spec
parent2c49c1af660a8e69446be442df81f9beaf0cf168 (diff)
downloadgitlab-ce-fix/import-export-build-token.tar.gz
Fix duplicated build token problem and added relevant specfix/import-export-build-token
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/import_export/project.json4
-rw-r--r--spec/lib/gitlab/import_export/project_tree_restorer_spec.rb8
2 files changed, 11 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index ed9df468ced..1e5901651ae 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -6548,7 +6548,9 @@
"url": null
},
"erased_by_id": null,
- "erased_at": null
+ "erased_at": null,
+ "type": "Ci::Build",
+ "token": "abcd"
},
{
"id": 72,
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 3038ab53ad8..13f593fb2db 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -189,6 +189,14 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
end
end
end
+
+ context 'existing builds' do
+ it 'do not throw errors' do
+ create(:ci_build, token: 'abcd')
+
+ expect(restored_project_json).to be true
+ end
+ end
end
end
end