TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[32447] Sort work packages to be copied by ID asc too

Browse Source 
https://community.openproject.com/wp/32447
pull/8144/head
Oliver Günther 5 years ago
parent 281153493a
commit 914883c236
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
2 changed files with 242 additions and 161 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/models/project/copy.rb
  2. 402
      spec/features/projects/copy_spec.rb

1
app/models/project/copy.rb
Unescape View File

@ -157,6 +157,7 @@ module Project::Copy
.work_packages
.includes(:custom_values, :fixed_version, :assigned_to, :responsible)
.order_by_ancestors('asc')
.order('id ASC')
user_cf_ids = WorkPackageCustomField.where(field_format: 'user').pluck(:id)

402
spec/features/projects/copy_spec.rb
Unescape View File

@ -31,190 +31,270 @@ require 'spec_helper'
describe 'Projects copy',
type: :feature,
js: true do
let!(:project) do
project = FactoryBot.create(:project,
parent: parent_project,
types: active_types,
custom_field_values: { project_custom_field.id => 'some text cf' })
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
describe 'with a full copy example' do
let!(:project) do
project = FactoryBot.create(:project,
parent: parent_project,
types: active_types,
custom_field_values: {project_custom_field.id => 'some text cf'})
project.work_package_custom_fields << wp_custom_field
project.types.first.custom_fields << wp_custom_field
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
# Enable wiki
project.enabled_module_names += ['wiki']
project.work_package_custom_fields << wp_custom_field
project.types.first.custom_fields << wp_custom_field
project
end
let!(:parent_project) do
project = FactoryBot.create(:project)
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
project
end
let!(:project_custom_field) do
FactoryBot.create(:text_project_custom_field, is_required: true)
end
let!(:wp_custom_field) do
FactoryBot.create(:text_wp_custom_field)
end
let!(:inactive_wp_custom_field) do
FactoryBot.create(:text_wp_custom_field)
end
let(:active_types) do
[FactoryBot.create(:type), FactoryBot.create(:type)]
end
let!(:inactive_type) do
FactoryBot.create(:type)
end
let(:user) { FactoryBot.create(:user) }
let(:role) do
FactoryBot.create(:role,
permissions: permissions)
end
let(:permissions) { %i(copy_projects edit_project add_subprojects manage_types view_work_packages) }
let(:wp_user) do
user = FactoryBot.create(:user)
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
user
end
let(:category) do
FactoryBot.create(:category, project: project)
end
let(:version) do
FactoryBot.create(:version, project: project)
end
let!(:work_package) do
FactoryBot.create(:work_package,
project: project,
type: project.types.first,
author: wp_user,
assigned_to: wp_user,
responsible: wp_user,
done_ratio: 20,
category: category,
fixed_version: version,
description: 'Some desciption',
custom_field_values: { wp_custom_field.id => 'Some wp cf text' })
end
let!(:wiki) { project.wiki }
let!(:wiki_page) do
FactoryBot.create :wiki_page_with_content,
title: 'Attached',
wiki: wiki,
attachments: [FactoryBot.build(:attachment, container: nil, filename: 'attachment.pdf')]
end
before do
login_as user
# Enable wiki
project.enabled_module_names += ['wiki']
allow(Delayed::Worker)
.to receive(:delay_jobs)
.and_return(false)
end
it 'copies projects and the associated objects' do
original_settings_page = Pages::Projects::Settings.new(project)
original_settings_page.visit!
click_link 'Copy'
fill_in 'Name', with: 'Copied project'
# Check copy wiki page attachments
check 'only_wiki_page_attachments'
project
end
# the value of the custom field should be preselected
editor = ::Components::WysiwygEditor.new ".form--field.custom_field_#{project_custom_field.id}"
editor.expect_value 'some text cf'
let!(:parent_project) do
project = FactoryBot.create(:project)
click_button 'Copy'
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
project
end
let!(:project_custom_field) do
FactoryBot.create(:text_project_custom_field, is_required: true)
end
let!(:wp_custom_field) do
FactoryBot.create(:text_wp_custom_field)
end
let!(:inactive_wp_custom_field) do
FactoryBot.create(:text_wp_custom_field)
end
let(:active_types) do
[FactoryBot.create(:type), FactoryBot.create(:type)]
end
let!(:inactive_type) do
FactoryBot.create(:type)
end
let(:user) { FactoryBot.create(:user) }
let(:role) do
FactoryBot.create(:role,
permissions: permissions)
end
let(:permissions) { %i(copy_projects edit_project add_subprojects manage_types view_work_packages) }
let(:wp_user) do
user = FactoryBot.create(:user)
FactoryBot.create(:member,
project: project,
user: user,
roles: [role])
user
end
let(:category) do
FactoryBot.create(:category, project: project)
end
let(:version) do
FactoryBot.create(:version, project: project)
end
let!(:work_package) do
FactoryBot.create(:work_package,
project: project,
type: project.types.first,
author: wp_user,
assigned_to: wp_user,
responsible: wp_user,
done_ratio: 20,
category: category,
fixed_version: version,
description: 'Some desciption',
custom_field_values: {wp_custom_field.id => 'Some wp cf text'})
end
original_settings_page.expect_notification message: I18n.t('copy_project.started',
source_project_name: project.name,
target_project_name: 'Copied project'),
type: 'notice'
let!(:wiki) { project.wiki }
let!(:wiki_page) do
FactoryBot.create :wiki_page_with_content,
title: 'Attached',
wiki: wiki,
attachments: [FactoryBot.build(:attachment, container: nil, filename: 'attachment.pdf')]
end
perform_enqueued_jobs
before do
login_as user
copied_project = Project.find_by(name: 'Copied project')
allow(Delayed::Worker)
.to receive(:delay_jobs)
.and_return(false)
end
expect(copied_project)
.to be_present
it 'copies projects and the associated objects' do
original_settings_page = Pages::Projects::Settings.new(project)
original_settings_page.visit!
click_link 'Copy'
fill_in 'Name', with: 'Copied project'
# Check copy wiki page attachments
check 'only_wiki_page_attachments'
# the value of the custom field should be preselected
editor = ::Components::WysiwygEditor.new ".form--field.custom_field_#{project_custom_field.id}"
editor.expect_value 'some text cf'
click_button 'Copy'
original_settings_page.expect_notification message: I18n.t('copy_project.started',
source_project_name: project.name,
target_project_name: 'Copied project'),
type: 'notice'
perform_enqueued_jobs
copied_project = Project.find_by(name: 'Copied project')
expect(copied_project)
.to be_present
copied_settings_page = Pages::Projects::Settings.new(copied_project)
copied_settings_page.visit!
# has the parent of the original project
expect(page)
.to have_select('Subproject of',
selected: parent_project.name)
# copies over the value of the custom field
editor = ::Components::WysiwygEditor.new ".form--field.custom_field_#{project_custom_field.id}"
editor.expect_value 'some text cf'
# has wp custom fields of original project active
copied_settings_page.visit_tab!('custom_fields')
copied_settings_page.expect_wp_custom_field_active(wp_custom_field)
copied_settings_page.expect_wp_custom_field_inactive(inactive_wp_custom_field)
# has types of original project activ
copied_settings_page.visit_tab!('types')
active_types.each do |type|
copied_settings_page.expect_type_active(type)
end
copied_settings_page.expect_type_inactive(inactive_type)
# Expect wiki was copied
expect(copied_project.wiki.pages.count).to eq(project.wiki.pages.count)
copied_page = copied_project.wiki.find_page 'Attached'
expect(copied_page).not_to be_nil
expect(copied_page.attachments.count).to eq 1
expect(copied_page.attachments.first.filename).to eq 'attachment.pdf'
# custom field is copied over where the author is the current user
# Using the db directly due to performance and clarity
copied_work_packages = copied_project.work_packages
expect(copied_work_packages.length)
.to eql 1
copied_work_package = copied_work_packages[0]
expect(copied_work_package.subject)
.to eql work_package.subject
expect(copied_work_package.author)
.to eql user
expect(copied_work_package.assigned_to)
.to eql work_package.assigned_to
expect(copied_work_package.responsible)
.to eql work_package.responsible
expect(copied_work_package.status)
.to eql work_package.status
expect(copied_work_package.done_ratio)
.to eql work_package.done_ratio
expect(copied_work_package.description)
.to eql work_package.description
expect(copied_work_package.category)
.to eql copied_project.categories.find_by(name: category.name)
expect(copied_work_package.fixed_version)
.to eql copied_project.versions.find_by(name: version.name)
expect(copied_work_package.custom_value_attributes)
.to eql(wp_custom_field.id => 'Some wp cf text')
end
end
copied_settings_page = Pages::Projects::Settings.new(copied_project)
copied_settings_page.visit!
describe 'copying a set of ordered work packages' do
let(:user) { FactoryBot.create :admin }
let(:project) { FactoryBot.create :project, types: [type] }
let(:type) { FactoryBot.create :type }
let(:status) { FactoryBot.create :status }
let(:priority) { FactoryBot.create :priority }
# has the parent of the original project
expect(page)
.to have_select('Subproject of',
selected: parent_project.name)
let(:default_params) do
{ type: type, status: status, project: project, priority: priority }
end
# copies over the value of the custom field
editor = ::Components::WysiwygEditor.new ".form--field.custom_field_#{project_custom_field.id}"
editor.expect_value 'some text cf'
let(:parent1) { FactoryBot.create :work_package, default_params.merge(subject: 'Initial phase') }
let(:child1_1) { FactoryBot.create :work_package, default_params.merge(parent: parent1, subject: 'Confirmation phase') }
let(:child1_2) { FactoryBot.create :work_package, default_params.merge(parent: parent1, subject: 'Initiation') }
let(:parent2) { FactoryBot.create :work_package, default_params.merge(subject: 'Execution') }
let(:child2_1) { FactoryBot.create :work_package, default_params.merge(parent: parent2, subject: 'Define goal') }
let(:child2_2) { FactoryBot.create :work_package, default_params.merge(parent: parent2, subject: 'Specify metrics') }
let(:child2_3) { FactoryBot.create :work_package, default_params.merge(parent: parent2, subject: 'Prepare launch') }
let(:child2_4) { FactoryBot.create :work_package, default_params.merge(parent: parent2, subject: 'Launch') }
let(:order) {
[parent1, child1_1, child1_2, parent2, child2_1, child2_2, child2_3, child2_4]
}
before do
parent1
child1_1
child1_2
parent2
child2_1
child2_2
child2_3
child2_4
login_as user
allow(Delayed::Worker)
.to receive(:delay_jobs)
.and_return(false)
end
# has wp custom fields of original project active
copied_settings_page.visit_tab!('custom_fields')
let(:wp_table) { ::Pages::WorkPackagesTable.new project }
copied_settings_page.expect_wp_custom_field_active(wp_custom_field)
copied_settings_page.expect_wp_custom_field_inactive(inactive_wp_custom_field)
let(:copied_project) { Project.find_by(name: 'Copied project') }
let(:copy_wp_table) { ::Pages::WorkPackagesTable.new copied_project }
# has types of original project activ
copied_settings_page.visit_tab!('types')
it 'copies them in the same order' do
wp_table.visit!
wp_table.expect_work_package_listed *order
wp_table.expect_work_package_order *order
active_types.each do |type|
copied_settings_page.expect_type_active(type)
end
original_settings_page = Pages::Projects::Settings.new(project)
original_settings_page.visit!
copied_settings_page.expect_type_inactive(inactive_type)
click_link 'Copy'
fill_in 'Name', with: 'Copied project'
# Expect wiki was copied
expect(copied_project.wiki.pages.count).to eq(project.wiki.pages.count)
copied_page = copied_project.wiki.find_page 'Attached'
expect(copied_page).not_to be_nil
expect(copied_page.attachments.count).to eq 1
expect(copied_page.attachments.first.filename).to eq 'attachment.pdf'
click_button 'Copy'
# custom field is copied over where the author is the current user
# Using the db directly due to performance and clarity
copied_work_packages = copied_project.work_packages
original_settings_page.expect_notification message: I18n.t('copy_project.started',
source_project_name: project.name,
target_project_name: 'Copied project'),
type: 'notice'
expect(copied_work_packages.length)
.to eql 1
perform_enqueued_jobs
copied_work_package = copied_work_packages[0]
expect(copied_project)
.to be_present
expect(copied_work_package.subject)
.to eql work_package.subject
expect(copied_work_package.author)
.to eql user
expect(copied_work_package.assigned_to)
.to eql work_package.assigned_to
expect(copied_work_package.responsible)
.to eql work_package.responsible
expect(copied_work_package.status)
.to eql work_package.status
expect(copied_work_package.done_ratio)
.to eql work_package.done_ratio
expect(copied_work_package.description)
.to eql work_package.description
expect(copied_work_package.category)
.to eql copied_project.categories.find_by(name: category.name)
expect(copied_work_package.fixed_version)
.to eql copied_project.versions.find_by(name: version.name)
expect(copied_work_package.custom_value_attributes)
.to eql(wp_custom_field.id => 'Some wp cf text')
wp_table.visit!
wp_table.expect_work_package_listed *order
wp_table.expect_work_package_order *order
end
end
end

Write Preview
Loading…
Cancel
Save