Skip to content

Commit a5b3cd9

Browse files
authored
Merge branch 'main' into typrescript-fixes
2 parents 6079587 + b6d489a commit a5b3cd9

File tree

13 files changed

+599
-652
lines changed

13 files changed

+599
-652
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Upload Cypress Screenshots
4040
if: always() # Run this step even if tests fail
41-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
41+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
4242
with:
4343
name: cypress-screenshots
4444
path: |

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ jobs:
7878
OCM_COMPONENT_VERSION: "v0.0.0-main"
7979

8080
- name: Publish OCM component
81-
run: task publish:ocm
81+
run: task publish:ocm OCM_TRANSFER_ARGS="--overwrite"

Taskfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ tasks:
4444
IMAGE_VERSION: '{{.IMAGE_VERSION | default (print .OCM_COMPONENT_VERSION)}}'
4545

4646
publish:ocm:
47-
desc: 'Publishes the ocm component to the registry.'
47+
desc: 'Publishes the ocm component to the registry. Usage: task publish:ocm [OCM_TRANSFER_ARGS="--overwrite"]'
4848
deps:
4949
- install:ocm
5050
cmds:
5151
- |
5252
{{.OCM}} transfer ctf \
53-
{{.OCM_OUTPUT_DIR}} {{.OCM_TARGET_REPO}}
53+
{{.OCM_OUTPUT_DIR}} {{.OCM_TARGET_REPO}} {{.OCM_TRANSFER_ARGS}}
5454
5555
build:image:local:
5656
desc: 'Builds the docker image for local testing. Usage: task test:build-image TAG=v-local-test'

cypress/support/commands.d.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
declare global {
2+
namespace Cypress {
3+
interface Chainable<Subject = unknown> {
4+
/**
5+
* Deep-compares two objects after normalising them with
6+
* JSON.stringify/parse (removes proxies, undefined, symbols …).
7+
*
8+
* @example
9+
* cy.wrap(actual).deepEqualJson(expected)
10+
*/
11+
deepEqualJson(expected: unknown): Chainable<Subject>;
12+
}
13+
}
14+
}
15+
16+
export {};

cypress/support/commands.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
import '@ui5/webcomponents-cypress-commands';
2-
import "../../src/utils/i18n/i18n";
2+
import '../../src/utils/i18n/i18n';
3+
4+
const toPlain = <T>(o: T): T => JSON.parse(JSON.stringify(o));
5+
6+
Cypress.Commands.add('deepEqualJson', { prevSubject: true }, (subject, expected) => {
7+
expect(toPlain(subject)).to.deep.equal(toPlain(expected));
8+
return subject;
9+
});

0 commit comments

Comments
 (0)