diff --git a/frontend/src/app/shared/components/fields/display/display-field.initializer.ts b/frontend/src/app/shared/components/fields/display/display-field.initializer.ts
index f8d092aa5bd7..7b38b7ad9285 100644
--- a/frontend/src/app/shared/components/fields/display/display-field.initializer.ts
+++ b/frontend/src/app/shared/components/fields/display/display-field.initializer.ts
@@ -109,7 +109,8 @@ export function initializeCoreDisplayFields(displayFieldService:DisplayFieldServ
'Category',
'Sprint',
'CustomField::Hierarchy::Item',
- 'CustomOption'])
+ 'CustomOption',
+ 'Workspace'])
.addFieldType(ProjectPhaseDisplayField, 'projectPhase', ['ProjectPhase'])
.addFieldType(ResourcesDisplayField, 'resources', ['[]CustomOption', '[]CustomField::Hierarchy::Item'])
.addFieldType(ResourcesDisplayField, 'resources', ['[]Version'])
diff --git a/spec/features/wysiwyg/macros/attribute_macros_spec.rb b/spec/features/wysiwyg/macros/attribute_macros_spec.rb
index 0c52c38b37e5..a4592d1c6876 100644
--- a/spec/features/wysiwyg/macros/attribute_macros_spec.rb
+++ b/spec/features/wysiwyg/macros/attribute_macros_spec.rb
@@ -31,8 +31,6 @@
require "spec_helper"
RSpec.describe "Wysiwyg attribute macros", :js do
- shared_let(:admin) { create(:admin) }
- let(:user) { admin }
let(:editor) { Components::WysiwygEditor.new }
let(:markdown) do
<<~MD
@@ -53,6 +51,7 @@
| projectLabel:identifier |
projectValue:identifier |
+ projectValue:"Subproject of" |
| invalid subject workPackageValue:"Invalid":subject |
@@ -77,11 +76,16 @@
shared_let(:type_milestone) { create(:type_milestone) }
shared_let(:type_task) { create(:type_task) }
+ shared_let(:parent_project) do
+ create(:project,
+ name: "Parent project")
+ end
shared_let(:project) do
create(:project,
identifier: "some-project",
types: [type_milestone, type_task],
- enabled_module_names: %w[wiki work_package_tracking])
+ enabled_module_names: %w[wiki work_package_tracking],
+ parent: parent_project)
end
shared_let(:work_package) do
create(:work_package,
@@ -98,11 +102,17 @@
due_date: "2023-01-10",
type: type_milestone)
end
-
- before do
- login_as(user)
+ shared_let(:role) { create(:project_role, permissions: %i[view_work_packages view_wiki_pages edit_wiki_pages]) }
+ shared_let(:user) do
+ create(:user,
+ member_with_roles: {
+ project => role,
+ parent_project => role
+ })
end
+ current_user { user }
+
describe "creating a wiki page" do
before do
visit project_wiki_path(project, :wiki)
@@ -124,6 +134,7 @@
expect(page).to have_css("td", text: "Foo Bar")
expect(page).to have_css("td", text: "Identifier")
expect(page).to have_css("td", text: "some-project")
+ expect(page).to have_css("td", text: "Parent project")
expect(page).to have_css("td", text: "invalid subject Cannot expand macro: Requested resource could not be found")
expect(page).to have_css("td",