From 44fdf983bd35328dd577d3d3650d14163ef3e2b6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Apr 2020 15:42:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- .../import_export/group/legacy_tree_saver_spec.rb | 158 +++++++++++++++++++++ .../gitlab/import_export/group/tree_saver_spec.rb | 158 --------------------- 2 files changed, 158 insertions(+), 158 deletions(-) create mode 100644 spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb delete mode 100644 spec/lib/gitlab/import_export/group/tree_saver_spec.rb (limited to 'spec/lib/gitlab/import_export') diff --git a/spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb b/spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb new file mode 100644 index 00000000000..a0490c255aa --- /dev/null +++ b/spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb @@ -0,0 +1,158 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::ImportExport::Group::LegacyTreeSaver do + describe 'saves the group tree into a json object' do + let(:shared) { Gitlab::ImportExport::Shared.new(group) } + let(:group_tree_saver) { described_class.new(group: group, current_user: user, shared: shared) } + let(:export_path) { "#{Dir.tmpdir}/group_tree_saver_spec" } + let(:user) { create(:user) } + let!(:group) { setup_group } + + before do + group.add_maintainer(user) + allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) + end + + after do + FileUtils.rm_rf(export_path) + end + + it 'saves group successfully' do + expect(group_tree_saver.save).to be true + end + + # It is mostly duplicated in + # `spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb` + # except: + # context 'with description override' do + # context 'group members' do + # ^ These are specific for the Group::LegacyTreeSaver + context 'JSON' do + let(:saved_group_json) do + group_tree_saver.save + group_json(group_tree_saver.full_path) + end + + it 'saves the correct json' do + expect(saved_group_json).to include({ 'description' => 'description' }) + end + + it 'has milestones' do + expect(saved_group_json['milestones']).not_to be_empty + end + + it 'has labels' do + expect(saved_group_json['labels']).not_to be_empty + end + + it 'has boards' do + expect(saved_group_json['boards']).not_to be_empty + end + + it 'has board label list' do + expect(saved_group_json['boards'].first['lists']).not_to be_empty + end + + it 'has group members' do + expect(saved_group_json['members']).not_to be_empty + end + + it 'has priorities associated to labels' do + expect(saved_group_json['labels'].first['priorities']).not_to be_empty + end + + it 'has badges' do + expect(saved_group_json['badges']).not_to be_empty + end + + context 'group children' do + let(:children) { group.children } + + it 'exports group children' do + expect(saved_group_json['children'].length).to eq(children.count) + end + + it 'exports group children of children' do + expect(saved_group_json['children'].first['children'].length).to eq(children.first.children.count) + end + end + + context 'group members' do + let(:user2) { create(:user, email: 'group@member.com') } + let(:member_emails) do + saved_group_json['members'].map do |pm| + pm['user']['email'] + end + end + + before do + group.add_developer(user2) + end + + it 'exports group members as group owner' do + group.add_owner(user) + + expect(member_emails).to include('group@member.com') + end + + context 'as admin' do + let(:user) { create(:admin) } + + it 'exports group members as admin' do + expect(member_emails).to include('group@member.com') + end + + it 'exports group members' do + member_types = saved_group_json['members'].map { |pm| pm['source_type'] } + + expect(member_types).to all(eq('Namespace')) + end + end + end + + context 'group attributes' do + shared_examples 'excluded attributes' do + excluded_attributes = %w[ + id + owner_id + parent_id + created_at + updated_at + runners_token + runners_token_encrypted + saml_discovery_token + ] + + excluded_attributes.each do |excluded_attribute| + it 'does not contain excluded attribute' do + expect(saved_group_json).not_to include(excluded_attribute => group.public_send(excluded_attribute)) + end + end + end + + include_examples 'excluded attributes' + end + end + end + + def setup_group + group = create(:group, description: 'description') + sub_group = create(:group, description: 'description', parent: group) + create(:group, description: 'description', parent: sub_group) + create(:milestone, group: group) + create(:group_badge, group: group) + group_label = create(:group_label, group: group) + create(:label_priority, label: group_label, priority: 1) + board = create(:board, group: group, milestone_id: Milestone::Upcoming.id) + create(:list, board: board, label: group_label) + create(:group_badge, group: group) + + group + end + + def group_json(filename) + ::JSON.parse(IO.read(filename)) + end +end diff --git a/spec/lib/gitlab/import_export/group/tree_saver_spec.rb b/spec/lib/gitlab/import_export/group/tree_saver_spec.rb deleted file mode 100644 index eb790662d8c..00000000000 --- a/spec/lib/gitlab/import_export/group/tree_saver_spec.rb +++ /dev/null @@ -1,158 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe Gitlab::ImportExport::Group::TreeSaver do - describe 'saves the group tree into a json object' do - let(:shared) { Gitlab::ImportExport::Shared.new(group) } - let(:group_tree_saver) { described_class.new(group: group, current_user: user, shared: shared) } - let(:export_path) { "#{Dir.tmpdir}/group_tree_saver_spec" } - let(:user) { create(:user) } - let!(:group) { setup_group } - - before do - group.add_maintainer(user) - allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) - end - - after do - FileUtils.rm_rf(export_path) - end - - it 'saves group successfully' do - expect(group_tree_saver.save).to be true - end - - # It is mostly duplicated in - # `spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb` - # except: - # context 'with description override' do - # context 'group members' do - # ^ These are specific for the Group::TreeSaver - context 'JSON' do - let(:saved_group_json) do - group_tree_saver.save - group_json(group_tree_saver.full_path) - end - - it 'saves the correct json' do - expect(saved_group_json).to include({ 'description' => 'description' }) - end - - it 'has milestones' do - expect(saved_group_json['milestones']).not_to be_empty - end - - it 'has labels' do - expect(saved_group_json['labels']).not_to be_empty - end - - it 'has boards' do - expect(saved_group_json['boards']).not_to be_empty - end - - it 'has board label list' do - expect(saved_group_json['boards'].first['lists']).not_to be_empty - end - - it 'has group members' do - expect(saved_group_json['members']).not_to be_empty - end - - it 'has priorities associated to labels' do - expect(saved_group_json['labels'].first['priorities']).not_to be_empty - end - - it 'has badges' do - expect(saved_group_json['badges']).not_to be_empty - end - - context 'group children' do - let(:children) { group.children } - - it 'exports group children' do - expect(saved_group_json['children'].length).to eq(children.count) - end - - it 'exports group children of children' do - expect(saved_group_json['children'].first['children'].length).to eq(children.first.children.count) - end - end - - context 'group members' do - let(:user2) { create(:user, email: 'group@member.com') } - let(:member_emails) do - saved_group_json['members'].map do |pm| - pm['user']['email'] - end - end - - before do - group.add_developer(user2) - end - - it 'exports group members as group owner' do - group.add_owner(user) - - expect(member_emails).to include('group@member.com') - end - - context 'as admin' do - let(:user) { create(:admin) } - - it 'exports group members as admin' do - expect(member_emails).to include('group@member.com') - end - - it 'exports group members' do - member_types = saved_group_json['members'].map { |pm| pm['source_type'] } - - expect(member_types).to all(eq('Namespace')) - end - end - end - - context 'group attributes' do - shared_examples 'excluded attributes' do - excluded_attributes = %w[ - id - owner_id - parent_id - created_at - updated_at - runners_token - runners_token_encrypted - saml_discovery_token - ] - - excluded_attributes.each do |excluded_attribute| - it 'does not contain excluded attribute' do - expect(saved_group_json).not_to include(excluded_attribute => group.public_send(excluded_attribute)) - end - end - end - - include_examples 'excluded attributes' - end - end - end - - def setup_group - group = create(:group, description: 'description') - sub_group = create(:group, description: 'description', parent: group) - create(:group, description: 'description', parent: sub_group) - create(:milestone, group: group) - create(:group_badge, group: group) - group_label = create(:group_label, group: group) - create(:label_priority, label: group_label, priority: 1) - board = create(:board, group: group, milestone_id: Milestone::Upcoming.id) - create(:list, board: board, label: group_label) - create(:group_badge, group: group) - - group - end - - def group_json(filename) - ::JSON.parse(IO.read(filename)) - end -end -- cgit v1.2.3