Skip to content

Commit 53cd5b3

Browse files
Merge branch 'dev' into uds-1444
2 parents 9629c31 + 84d5b70 commit 53cd5b3

File tree

628 files changed

+8690
-18345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

628 files changed

+8690
-18345
lines changed

.eslintignore

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

.eslintrc.base.js

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

.eslintrc.js

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

.husky/pre-push

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
#!/bin/sh
22
[ -n "$CI" ] && exit 0
33

4-
echo "Running build and tests..."
5-
yarn test && yarn build
4+
# Check for skip checks via environment variable
5+
# Usage:
6+
# - Run with env var: SKIP_PUSH_HOOK=1 git push
7+
if [ "$SKIP_PUSH_HOOK" = "1" ]; then
8+
echo "Skipping build and tests..."
9+
exit 0
10+
else
11+
echo "Running build and tests..."
12+
yarn test && yarn build
613

7-
if [ $? -ne 0 ]; then
8-
echo "Build or tests failed. Please fix errors before pushing."
9-
exit 1
14+
if [ $? -ne 0 ]; then
15+
echo "Build or tests failed. Please fix errors before pushing or use 'SKIP_PUSH_HOOK=1 git push' to skip."
16+
exit 1
17+
fi
1018
fi

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
"titleBar.activeForeground": "#FFC627",
1616
"titleBar.inactiveBackground": "#8C1D40",
1717
"titleBar.inactiveForeground": "#D0D0D0"
18-
}
18+
},
19+
"typescript.tsdk": "node_modules/typescript/lib"
1920
}

Jenkinsfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,27 @@ spec:
266266
}
267267
}
268268
}
269+
stage('Accessibility testing') {
270+
when {
271+
branch 'dev'
272+
}
273+
steps {
274+
container('playwright') {
275+
script {
276+
def accessibilityTestResults = sh(
277+
script: 'yarn test:accessibility',
278+
returnStatus: true
279+
)
280+
if (accessibilityTestResults != 0) {
281+
slackSend(
282+
channel: '#prdfam-uds-ci',
283+
color: 'warning',
284+
message: "@uds-developers Accessibility tests failed.: ${env.RUN_DISPLAY_URL} \n Pull Branch and run tests locally to see report"
285+
)
286+
}
287+
}
288+
}
289+
}
290+
}
269291
}
270292
}

0 commit comments

Comments
 (0)