diff options
| author | James Lopez <james@jameslopez.es> | 2016-08-11 11:03:26 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-08-11 12:49:07 +0200 |
| commit | efab1677a7a2959a28a09393a2b6519072005534 (patch) | |
| tree | 5e8d497539f68f56bde4804ce46d910e2882ef2d /spec | |
| parent | 34d5426f0e17a9d0a2d2330b472114e7e457ae05 (diff) | |
| download | gitlab-ce-efab1677a7a2959a28a09393a2b6519072005534.tar.gz | |
Fix attribute inclusion in import/export config ignored in some cases
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/import_export/reader_spec.rb | 3 | ||||
| -rw-r--r-- | spec/support/import_export/import_export.yml | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/reader_spec.rb b/spec/lib/gitlab/import_export/reader_spec.rb index b76e14deca1..b6dec41d218 100644 --- a/spec/lib/gitlab/import_export/reader_spec.rb +++ b/spec/lib/gitlab/import_export/reader_spec.rb @@ -12,7 +12,8 @@ describe Gitlab::ImportExport::Reader, lib: true do except: [:iid], include: [:merge_request_diff, :merge_request_test] } }, - { commit_statuses: { include: :commit } }] + { commit_statuses: { include: :commit } }, + { project_members: { include: { user: { only: [:email] } } } }] } end diff --git a/spec/support/import_export/import_export.yml b/spec/support/import_export/import_export.yml index 3ceec506401..17136dee000 100644 --- a/spec/support/import_export/import_export.yml +++ b/spec/support/import_export/import_export.yml @@ -7,6 +7,8 @@ project_tree: - :merge_request_test - commit_statuses: - :commit + - project_members: + - :user included_attributes: project: @@ -14,6 +16,8 @@ included_attributes: - :path merge_requests: - :id + user: + - :email excluded_attributes: merge_requests: |