diff options
author | James Lopez <james@jameslopez.es> | 2016-08-19 17:22:02 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-09-09 14:56:10 +0200 |
commit | ad14944be717884dba9e11187a81fde281ac2237 (patch) | |
tree | 2bbe10a127d8a428889d10dfe3a3fdf774349e9d | |
parent | ff1d6477dade1564d8d8f366375607ce57f3592f (diff) | |
download | gitlab-ce-ad14944be717884dba9e11187a81fde281ac2237.tar.gz |
fix specs so they work in EE straight away
-rw-r--r-- | spec/features/projects/import_export/export_file_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/attribute_configuration_spec.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb index eea0f595eb0..8188403f18f 100644 --- a/spec/features/projects/import_export/export_file_spec.rb +++ b/spec/features/projects/import_export/export_file_spec.rb @@ -147,7 +147,7 @@ feature 'project export', feature: true, js: true do def has_sensitive_attributes?(sensitive_word, project_hash) loop do object, parent = deep_find_with_parent(sensitive_word, project_hash) - parent.except!('created_at', 'updated_at', 'url') if parent + parent.except!('created_at', 'updated_at', 'url', 'group_id') if parent if object && safe_hashes[sensitive_word.to_sym].include?(parent) # It's in the safe list, remove hash and keep looking diff --git a/spec/lib/gitlab/import_export/attribute_configuration_spec.rb b/spec/lib/gitlab/import_export/attribute_configuration_spec.rb index 7872f0c2257..968a2eb6d42 100644 --- a/spec/lib/gitlab/import_export/attribute_configuration_spec.rb +++ b/spec/lib/gitlab/import_export/attribute_configuration_spec.rb @@ -15,9 +15,9 @@ describe 'Attribute configuration', lib: true do let(:safe_model_attributes) do { - 'Issue' => %w[id title assignee_id author_id project_id created_at updated_at position branch_name description state iid updated_by_id confidential deleted_at due_date moved_to_id lock_version], + 'Issue' => %w[id title assignee_id author_id project_id created_at updated_at position branch_name description state iid updated_by_id confidential deleted_at due_date moved_to_id lock_version milestone_id weight], 'Event' => %w[id target_type target_id title data project_id created_at updated_at action author_id], - 'Note' => %w[id note noteable_type author_id created_at updated_at project_id attachment line_code commit_id noteable_id system st_diff updated_by_id type position original_position], + 'Note' => %w[id note noteable_type author_id created_at updated_at project_id attachment line_code commit_id noteable_id system st_diff updated_by_id type position original_position resolved_at resolved_by_id discussion_id original_discussion_id], 'LabelLink' => %w[id label_id target_id target_type created_at updated_at], 'Label' => %w[id title color project_id created_at updated_at template description priority], 'Milestone' => %w[id title project_id description due_date created_at updated_at state iid], @@ -25,7 +25,7 @@ describe 'Attribute configuration', lib: true do 'Release' => %w[id tag description project_id created_at updated_at], 'ProjectMember' => %w[id access_level source_id source_type user_id notification_level type created_at updated_at created_by_id invite_email invite_token invite_accepted_at requested_at], 'User' => %w[id username email], - 'MergeRequest' => %w[id target_branch source_branch source_project_id author_id assignee_id title created_at updated_at state merge_status target_project_id iid description position locked_at updated_by_id merge_error merge_params merge_when_build_succeeds merge_user_id merge_commit_sha deleted_at in_progress_merge_commit_sha lock_version], + 'MergeRequest' => %w[id target_branch source_branch source_project_id author_id assignee_id title created_at updated_at state merge_status target_project_id iid description position locked_at updated_by_id merge_error merge_params merge_when_build_succeeds merge_user_id merge_commit_sha deleted_at in_progress_merge_commit_sha lock_version milestone_id approvals_before_merge rebase_commit_sha], 'MergeRequestDiff' => %w[id state st_commits merge_request_id created_at updated_at base_commit_sha real_size head_commit_sha start_commit_sha], 'Ci::Pipeline' => %w[id project_id ref sha before_sha push_data created_at updated_at tag yaml_errors committed_at gl_project_id status started_at finished_at duration user_id], 'CommitStatus' => %w[id project_id status finished_at trace created_at updated_at started_at runner_id coverage commit_id commands job_id name deploy options allow_failure stage trigger_request_id stage_idx tag ref user_id type target_url description artifacts_file gl_project_id artifacts_metadata erased_by_id erased_at artifacts_expire_at environment artifacts_size when yaml_variables queued_at], @@ -33,7 +33,7 @@ describe 'Attribute configuration', lib: true do 'Ci::Trigger' => %w[id token project_id deleted_at created_at updated_at gl_project_id], 'DeployKey' => %w[id user_id created_at updated_at key title type fingerprint public], 'Service' => %w[id type title project_id created_at updated_at active properties template push_events issues_events merge_requests_events tag_push_events note_events pipeline_events build_events category default wiki_page_events], - 'ProjectHook' => %w[id url project_id created_at updated_at type service_id push_events issues_events merge_requests_events tag_push_events note_events pipeline_events enable_ssl_verification build_events wiki_page_events token], + 'ProjectHook' => %w[id url project_id created_at updated_at type service_id push_events issues_events merge_requests_events tag_push_events note_events pipeline_events enable_ssl_verification build_events wiki_page_events token group_id], 'ProtectedBranch' => %w[id project_id name created_at updated_at], 'Project' => %w[description issues_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived] } |