diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 31eabdf03..6cc489543 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -14,6 +14,7 @@ SPDX-License-Identifier: CC0-1.0 - **[Benedikt Richter](https://github.com/benedikt-richter)** () - **[Benjamin Petek](https://github.com/b-petek)** - **[David Mundelius](https://github.com/davidmundelius)** () +- **[Dominikus Hellgartner](https://github.com/Hellgartner)** () - **[Florian Schepers](https://github.com/FlorianSchepers)** () - **[Indira Bhatt](https://github.com/indirabhatt)** () - **[Jakob Schubert](https://github.com/JakobSchubert)** diff --git a/src/Frontend/Components/AttributionForm/LicenseSubPanel/LicenseSubPanel.tsx b/src/Frontend/Components/AttributionForm/LicenseSubPanel/LicenseSubPanel.tsx index 0696c33b0..b86339e86 100644 --- a/src/Frontend/Components/AttributionForm/LicenseSubPanel/LicenseSubPanel.tsx +++ b/src/Frontend/Components/AttributionForm/LicenseSubPanel/LicenseSubPanel.tsx @@ -77,7 +77,7 @@ export function LicenseSubPanel({ { renderComponent(); expect(screen.queryByLabelText('Copyright')).not.toBeInTheDocument(); - expect(screen.queryByLabelText('License Name')).not.toBeInTheDocument(); + expect( + screen.queryByLabelText('License Expression'), + ).not.toBeInTheDocument(); + }); + + it('does show copyright or license name fields when attribution is third party', () => { + const packageInfo = faker.opossum.packageInfo({ firstParty: false }); + renderComponent(); + + expect(screen.getByLabelText('Copyright')).toBeInTheDocument(); + expect(screen.getByLabelText('License Expression')).toBeInTheDocument(); }); }); diff --git a/src/e2e-tests/page-objects/AttributionForm.ts b/src/e2e-tests/page-objects/AttributionForm.ts index 4fa552cb4..47d6cfd26 100644 --- a/src/e2e-tests/page-objects/AttributionForm.ts +++ b/src/e2e-tests/page-objects/AttributionForm.ts @@ -77,7 +77,7 @@ export class AttributionForm { this.comment = this.node.getByLabel('Comment', { exact: true }); this.copyright = this.node.getByLabel('Copyright', { exact: true }); this.licenseName = this.node.getByLabel( - text.attributionColumn.licenseName, + text.attributionColumn.licenseExpression, { exact: true, }, diff --git a/src/shared/text.ts b/src/shared/text.ts index f52b8bdfa..a6bfea69e 100644 --- a/src/shared/text.ts +++ b/src/shared/text.ts @@ -24,7 +24,7 @@ export const text = { homepage: 'Homepage', invalidPurl: 'INVALID PURL', legalInformation: 'Legal Information', - licenseName: 'License Name', + licenseExpression: 'License Expression', licenseText: 'License Text', licenseTextDefault: 'License Text (inferred from license name)', link: 'Link as attribution on selected resource',