Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and improve acceptance testing attributes #665

Merged
merged 10 commits into from
Jan 18, 2024
Merged

Fix and improve acceptance testing attributes #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fed379d
Fix and improve acceptance testing attributes
Cruikshanks Jan 17, 2024
f5d19fd
Add attribute to meta-data in view single licence
Cruikshanks Jan 17, 2024
24286ee
Add attribute to meta data in view multi licence
Cruikshanks Jan 17, 2024
41ba8be
Fix incorrect name for debits total
Cruikshanks Jan 17, 2024
97c21c4
Fix duplicate data attributes in the same page
Cruikshanks Jan 17, 2024
a0246df
Add attribute to meta data in view bill run
Cruikshanks Jan 18, 2024
6f741c7
Add missing hyphen to attribute name
Cruikshanks Jan 18, 2024
c561e7b
Correct comment
Cruikshanks Jan 18, 2024
d561bbd
Add another missing hyphen to attribute name
Cruikshanks Jan 18, 2024
a86e286
Merge branch 'main' into fix-and-improve-acp-test-attributes
Cruikshanks Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions app/views/bill-runs/view.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
</p>

{# Bill run meta-data #}
{#
GOV.UK summary lists only allow us to assign attributes at the top level and not to each row. This means we
can't assign our data-test attribute using the component. Our solution is to use the html option for each row
instead of text and wrap each value in a <span>. That way we can manually assign our data-test attribute to the
span.
#}
{{
govukSummaryList({
classes: 'govuk-summary-list--no-border',
Expand All @@ -48,31 +54,31 @@
rows: [
{
key: { text: "Date created", classes: "meta-data__label" },
value: { text: dateCreated, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-created">' + dateCreated + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Region", classes: "meta-data__label" },
value: { text: region, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-region">' + region + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Bill run type", classes: "meta-data__label" },
value: { text: billRunType, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-type">' + billRunType + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Charge scheme", classes: "meta-data__label" },
value: { text: chargeScheme, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-scheme">' + chargeScheme + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Financial year", classes: "meta-data__label" },
value: { text: financialYear, classes: "meta-data__value" }
} if financialYear,
value: { html: '<span data-test="meta-data-year">' + financialYear + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Transaction file", classes: "meta-data__label" },
value: { text: transactionFile, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-file">' + transactionFile + '</span>', classes: "meta-data__value" }
} if transactionFile,
{
key: { text: "Bill number", classes: "meta-data__label" },
value: { text: billNumber, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-number">' + billNumber + '</span>', classes: "meta-data__value" }
} if billNumber
]
})
Expand Down Expand Up @@ -227,7 +233,7 @@
{% set tableRow = [
{
text: bill.accountNumber,
attributes: { 'data-test': 'account-number' + rowIndex }
attributes: { 'data-test': 'account-number-' + rowIndex }
},
{
text: bill.billingContact,
Expand All @@ -245,7 +251,7 @@
{
text: bill.financialYear,
format: 'numeric',
attributes: { 'data-test': 'financial-year' + rowIndex }
attributes: { 'data-test': 'financial-year-' + rowIndex }
}
), tableRow) %}
{% endif %}
Expand Down
22 changes: 14 additions & 8 deletions app/views/bills/view-multi-licence.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
</p>

{# Bill meta-data #}
{#
GOV.UK summary lists only allow us to assign attributes at the top level and not to each row. This means we
can't assign our data-test attribute using the component. Our solution is to use the html option for each row
instead of text and wrap each value in a <span>. That way we can manually assign our data-test attribute to the
span.
#}
{{
govukSummaryList({
classes: 'govuk-summary-list--no-border',
Expand All @@ -49,31 +55,31 @@
rows: [
{
key: { text: "Date created", classes: "meta-data__label" },
value: { text: dateCreated, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-created">' + dateCreated + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Region", classes: "meta-data__label" },
value: { text: region, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-region">' + region + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Bill run type", classes: "meta-data__label" },
value: { text: billRunType, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-type">' + billRunType + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Charge scheme", classes: "meta-data__label" },
value: { text: chargeScheme, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-scheme">' + chargeScheme + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Financial year", classes: "meta-data__label" },
value: { text: financialYear, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-year">' + financialYear + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Transaction file", classes: "meta-data__label" },
value: { text: transactionFile, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-file">' + transactionFile + '</span>', classes: "meta-data__value" }
} if transactionFile,
{
key: { text: "Bill number", classes: "meta-data__label" },
value: { text: billNumber, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-number">' + billNumber + '</span>', classes: "meta-data__value" }
} if billNumber
]
})
Expand Down Expand Up @@ -134,7 +140,7 @@
</div>
<div class="govuk-grid-column-one-half">
<h2>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="credits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="debits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-24">Debits</span>
</h2>
</div>
Expand Down
26 changes: 16 additions & 10 deletions app/views/bills/view-single-licence-presroc.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
</p>

{# Bill meta-data #}
{#
GOV.UK summary lists only allow us to assign attributes at the top level and not to each row. This means we
can't assign our data-test attribute using the component. Our solution is to use the html option for each row
instead of text and wrap each value in a <span>. That way we can manually assign our data-test attribute to the
span.
#}
{{
govukSummaryList({
classes: 'govuk-summary-list--no-border',
Expand All @@ -49,31 +55,31 @@
rows: [
{
key: { text: "Date created", classes: "meta-data__label" },
value: { text: dateCreated, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-created">' + dateCreated + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Region", classes: "meta-data__label" },
value: { text: region, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-region">' + region + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Bill run type", classes: "meta-data__label" },
value: { text: billRunType, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-type">' + billRunType + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Charge scheme", classes: "meta-data__label" },
value: { text: chargeScheme, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-scheme">' + chargeScheme + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Financial year", classes: "meta-data__label" },
value: { text: financialYear, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-year">' + financialYear + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Transaction file", classes: "meta-data__label" },
value: { text: transactionFile, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-file">' + transactionFile + '</span>', classes: "meta-data__value" }
} if transactionFile,
{
key: { text: "Bill number", classes: "meta-data__label" },
value: { text: billNumber, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-number">' + billNumber + '</span>', classes: "meta-data__value" }
} if billNumber
]
})
Expand Down Expand Up @@ -134,7 +140,7 @@
</div>
<div class="govuk-grid-column-one-half">
<h2>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="credits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="debits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-24">Debits</span>
</h2>
</div>
Expand Down Expand Up @@ -372,7 +378,7 @@
text: creditTotal,
format: 'numeric',
classes: 'govuk-!-font-weight-bold',
attributes: { 'data-test': 'credits-total' }
attributes: { 'data-test': 'transactions-credits-total' }
},
{
text: '',
Expand All @@ -389,7 +395,7 @@
text: debitTotal,
format: 'numeric',
classes: 'govuk-!-font-weight-bold',
attributes: { 'data-test': 'debits-total' }
attributes: { 'data-test': 'transactions-debits-total' }
}
] %}

Expand Down
26 changes: 16 additions & 10 deletions app/views/bills/view-single-licence-sroc.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
</p>

{# Bill meta-data #}
{#
GOV.UK summary lists only allow us to assign attributes at the top level and not to each row. This means we
can't assign our data-test attribute using the component. Our solution is to use the html option for each row
instead of text and wrap each value in a <span>. That way we can manually assign our data-test attribute to the
span.
#}
{{
govukSummaryList({
classes: 'govuk-summary-list--no-border',
Expand All @@ -49,31 +55,31 @@
rows: [
{
key: { text: "Date created", classes: "meta-data__label" },
value: { text: dateCreated, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-created">' + dateCreated + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Region", classes: "meta-data__label" },
value: { text: region, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-region">' + region + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Bill run type", classes: "meta-data__label" },
value: { text: billRunType, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-type">' + billRunType + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Charge scheme", classes: "meta-data__label" },
value: { text: chargeScheme, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-scheme">' + chargeScheme + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Financial year", classes: "meta-data__label" },
value: { text: financialYear, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-year">' + financialYear + '</span>', classes: "meta-data__value" }
},
{
key: { text: "Transaction file", classes: "meta-data__label" },
value: { text: transactionFile, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-file">' + transactionFile + '</span>', classes: "meta-data__value" }
} if transactionFile,
{
key: { text: "Bill number", classes: "meta-data__label" },
value: { text: billNumber, classes: "meta-data__value" }
value: { html: '<span data-test="meta-data-number">' + billNumber + '</span>', classes: "meta-data__value" }
} if billNumber
]
})
Expand Down Expand Up @@ -134,7 +140,7 @@
</div>
<div class="govuk-grid-column-one-half">
<h2>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="credits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-48" data-test="debits-total">{{ debitsTotal }}</span><br>
<span class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-24">Debits</span>
</h2>
</div>
Expand Down Expand Up @@ -367,7 +373,7 @@
text: creditTotal,
format: 'numeric',
classes: 'govuk-!-font-weight-bold',
attributes: { 'data-test': 'credits-total' }
attributes: { 'data-test': 'transactions-credits-total' }
},
{
text: '',
Expand All @@ -384,7 +390,7 @@
text: debitTotal,
format: 'numeric',
classes: 'govuk-!-font-weight-bold',
attributes: { 'data-test': 'debits-total' }
attributes: { 'data-test': 'transactions-debits-total' }
}
] %}

Expand Down
Loading