Skip to content

Commit c35cb4a

Browse files
y82y82
authored
Merge branch 'main' into urls
2 parents 0570556 + d9bb351 commit c35cb4a

File tree

15 files changed

+540
-1825
lines changed

15 files changed

+540
-1825
lines changed

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[//]: # "If the changes were defined by a GitHub issue, reference it using keywords."
1515
[//]: # "https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests"
1616

17-
[//]: # "Do not like to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
17+
[//]: # "Do not link to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
1818
[//]: # "You can make reference to internal discussions without linking to them: see 'Referencing internal information'."
1919
[//]: # "https://github.com/nginx/documentation/blob/main/documentation/closed-contributions.md#referencing-internal-information"
2020

‎.github/workflows/build-push.yml‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -115,51 +115,4 @@ jobs:
115115
}
116116
env:
117117
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FRIENDS_OF_DOCS }}
118-
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
119-
120-
121-
lighthouseci:
122-
if: github.event.pull_request
123-
needs: call-docs-build-push
124-
runs-on: ubuntu-22.04
125-
steps:
126-
- uses: actions/checkout@v5
127-
with:
128-
ref: ${{ github.event.workflow_run.head_branch }}
129-
- uses: actions/setup-node@v5
130-
with:
131-
node-version: 18
132-
- name: Installing packages
133-
run: npm install
134-
- name: Generating lighthouse reports for PR and main...
135-
run: |
136-
node lighthouse-script.js
137-
- name: Compare the artifacts for negative differences in performance
138-
continue-on-error: true
139-
run: |
140-
FIELDS=("performance" "accessibility")
141-
for FIELD in "${FIELDS[@]}"; do
142-
PR_VALUE=$(cat lighthouse-reports/pr-report.json | jq -r ".categories.$FIELD.score")
143-
MAIN_VALUE=$(cat lighthouse-reports/main-report.json | jq -r ".categories.$FIELD.score")
144-
echo "$FIELD: PR - $PR_VALUE | Main - $MAIN_VALUE"
145-
146-
if [ $FIELD = "performance" ]; then
147-
LOWER_BOUND=$(echo "$MAIN_VALUE - 0.05" | bc)
148-
UPPER_BOUND=$(echo "$MAIN_VALUE + 0.05" | bc)
149-
if (( $(echo "$PR_VALUE < $LOWER_BOUND" | bc -l) || $(echo "$PR_VALUE > $UPPER_BOUND" | bc -l) )); then
150-
echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
151-
exit 1
152-
fi
153-
else
154-
if (( $(echo "$PR_VALUE < $MAIN_VALUE" | bc -l) )); then
155-
echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
156-
exit 1
157-
fi
158-
fi
159-
done
160-
- uses: actions/upload-artifact@v4
161-
if: ${{ !cancelled() }}
162-
with:
163-
name: lighthouse-reports
164-
path: lighthouse-reports/
165-
retention-days: 30
118+
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}

‎.github/workflows/notification.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
workflows:
66
- "QE LinkChecker"
77
- "Check for Broken Links"
8+
- "UI validation on prod"
89
types: [completed]
910

1011
permissions:

‎.github/workflows/playwright.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: UI validation on prod
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 * * * *"
6+
7+
jobs:
8+
run-playwright-tests:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
13+
with:
14+
node-version: lts/*
15+
- name: Install dependencies
16+
run: npm ci
17+
- name: Install Playwright Browsers
18+
run: npx playwright install --with-deps
19+
- name: Run Playwright tests
20+
run: npx playwright test --retries=2
21+
- uses: actions/upload-artifact@v4
22+
if: ${{ !cancelled() }}
23+
with:
24+
name: playwright-report
25+
path: tests/playwright-report/
26+
retention-days: 30
27+
- uses: actions/upload-artifact@v4
28+
if: ${{ !cancelled() }}
29+
with:
30+
name: test-results
31+
path: tests/test-results/
32+
retention-days: 30

‎.gitignore‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ resources/
3535
.netlify/plugins/*
3636
.netlify/
3737

38-
# Local Lighthouse artifacts
39-
lighthouse-reports
40-
4138
*.pyc
4239
build
4340
*.swp
4441
*.mo
4542
node_modules
43+
44+
# Playwright
45+
/coverage
46+
*/test-results
47+
*/playwright-report

‎content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The registry contains the following image types:
3535
- [NGINX Plus]({{< ref "/nginx/releases.md" >}}):</br>
3636
`https://private-registry.nginx.com/v2/nginx-plus/base`
3737

38-
- [Unprivileged]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-plus.md#nginx-plus-unprivileged-installation" >}}) installation of NGINX Plus:</br>
38+
- [Unprivileged]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-plus.md#unpriv_install" >}}) installation of NGINX Plus:</br>
3939
`https://private-registry.nginx.com/v2/nginx-plus/rootless-base`
4040

4141
- NGINX Plus bundled with [NGINX Agent](https://docs.nginx.com/nginx-agent/overview/):</br>

‎content/nginxaas-azure/billing/usage-and-cost-estimator.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@ type:
1111
{{< raw-html >}}
1212

1313
<link rel="stylesheet" href="/nginxaas-azure/css/cost-calculator_v2.css">
14-
<div id="calculator">
15-
<h3 id="calculator-section-heading">
14+
<div id="calculator" data-testid="calculator">
15+
<h3 id="calculator-section-heading" data-testid="calculator-section-heading">
1616
Cost Estimation for Standard V2 Plan
1717
<button id="printButton">Print Estimate</button>
1818
</h3>
19-
<div class="section">
19+
<div class="section" data-testid="calculator-section-content">
2020
<div class="form-section">
21-
<div class="form-section-content">
21+
<div class="form-section-content" data-testid="form-section-content-estimateNCUUsage">
2222
<h4>1. Estimate NCU Usage </h4>
2323
<div>
2424
<div class="form-field">
2525
<label for="avgNewConnsPerSec">
2626
Average New Connections per Second
2727
</label>
28-
<input id="avgNewConnsPerSec" type="number" />
28+
<input id="avgNewConnsPerSec" type="number" data-testid="input-avgNewConnsPerSec"/>
2929
</div>
3030
<div class="form-field avg-conn-duration-container">
3131
<label for="avgConnDuration">
3232
Average Connection Duration
3333
</label>
34-
<input id="avgConnDuration" type="number" />
34+
<input id="avgConnDuration" type="number" data-testid="input-avgConnDuration"/>
3535
</div>
3636
<div class="form-field bandwidth-input-container">
3737
<label for="totalBandwidth">
3838
Total Processed Data
3939
</label>
40-
<input id="totalBandwidth" type="number" />
40+
<input id="totalBandwidth" type="number" data-testid="input-totalBandwidth"/>
4141
</div>
4242
</div>
4343
</div>
44-
<div class="form-section-content">
44+
<div class="form-section-content" data-testid="form-section-content-capacityUnitsNeeded">
4545
<div class=form-section-footer>
4646
<div class="totals">
4747
<span>NGINX Capacity Units Needed</span>
48-
<span id="ncuEstimateValue">--</span>
48+
<span id="ncuEstimateValue" data-testid="ncuEstimateValue">--</span>
4949
<span> Sold in bundles of 10, with a minimum of 10</span>
5050
</div>
5151
<details id="ncu-usage-details">
52-
<summary>Show calculations</summary>
52+
<summary data-testid="button-ncu-usage-details">Show calculations</summary>
5353
<div id="ncuEstimateDetails">
5454
<div class="math">
5555
<var id="ncuEstConnRate">x</var> new connections per second *
@@ -72,36 +72,36 @@ Max(
7272
</div>
7373
</div>
7474
<div class="form-section">
75-
<div class=form-section-content>
75+
<div class="form-section-content" data-testid="form-section-content-estimateMonthlyCost">
7676
<h4 id="calculator-section-heading">
7777
2. Estimate Monthly Cost
7878
</h4>
7979
<div class="form-field">
8080
<label for="region">
8181
Region
8282
</label>
83-
<select id="region">
83+
<select id="region" data-testid="dropdown-region">
8484
<!-- options appended from tiers data -->
8585
</select>
8686
</div>
8787
<div class="form-field">
8888
<label for="numNcus">
8989
NCUs <span class="label-details">- value from usage estimate: <span id="numNcusEstVal"> - </span></span>
9090
</label>
91-
<input id="numNcus" type="number" step="10" min="10" />
91+
<input id="numNcus" data-testid="input-numNcus" type="number" step="10" min="10" />
9292
<span id="ncuValidation"></span>
9393
</div>
9494
<div class="form-field">
9595
<label for="numHours">
9696
Hours <span class="label-details">- used in a month</span>
9797
</label>
98-
<input id="numHours" type="number"/>
98+
<input id="numHours" data-testid="input-numHours" type="number"/>
9999
</div>
100100
<div class="form-field">
101101
<label for="numListenPorts">
102102
Listen Ports <span class="label-details">- first 5 are included</span>
103103
</label>
104-
<input id="numListenPorts" type="number"/>
104+
<input id="numListenPorts" data-testid="input-numListenPorts" type="number"/>
105105
</div>
106106
<div class="form-field">
107107
<label for="isWAF">
@@ -113,7 +113,7 @@ Max(
113113
<div class=form-section-content>
114114
<div id="totals-section">
115115
<span class="total-text">Total Monthly Payment</span>
116-
<span id="total-value" class="total-text">--</span>
116+
<span id="total-value" data-testid="total-value" class="total-text">--</span>
117117
<div class="subtitle">
118118
The standard Azure networking and bandwidth charges apply to NGINX deployments.
119119
</div>

‎content/nginxaas-azure/changelog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To see a list of currently active issues, visit the [Known issues]({{< ref "/ngi
1414
To review older entries, visit the [Changelog archive]({{< ref "/nginxaas-azure/changelog-archive" >}}) section.
1515

1616

17-
## Aug 18, 2025
17+
## August 18, 2025
1818

1919
- {{% icon-feature %}} **Updates to NGINXaaS for Azure GitHub Action**
2020

‎lighthouse-script.js‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)