Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions cypress/e2e/dataTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,19 @@ const mockedGetCommunicationTopicsExpectedResponse = {
},
},
}
const mockedGetCommunicationSettingsSearchExpectedResponse = {
callId: '015f04e745e9798c81026b182es73504',
context: '{}',
errorCode: 0,
errorDetails: '',
apiVersion: 2,
statusCode: 200,
statusReason: 'OK',
time: '2026-06-25T17:08:14.119Z',
results: [],
objectsCount: 0,
totalCount: 0,
}

const mockedSetCommunicationResponse = {
callId: 'f88bef4a500440a2914e17c0c1177276',
Expand Down Expand Up @@ -2407,4 +2420,5 @@ export {
mockedVersionControlGetListBranches,
mockedVersionControlGetListBranches2,
mockedVersionControlGetCommitsEmptyResponse,
mockedGetCommunicationSettingsSearchExpectedResponse,
}
1 change: 0 additions & 1 deletion cypress/e2e/importAccounts.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as utils from './utils'
import * as dataTest from './dataTest'

describe('Import Account - Configuration Tree test suite', () => {
context('Configuration Tree ', () => {
Expand Down
13 changes: 13 additions & 0 deletions cypress/e2e/prettifyCode.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ describe('UI Builder - Prettify Code', () => {
context('Single Screen - No javascript on the screenSet', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${liteRegistration}`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')

utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse)
})
afterEach(() => {
Expand All @@ -30,6 +33,8 @@ describe('UI Builder - Prettify Code', () => {
context('Single Screen - View Success PopUp', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${linkAccounts}`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')
utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse)
})
afterEach(() => {
Expand All @@ -46,6 +51,8 @@ describe('UI Builder - Prettify Code', () => {
context('Single Screen - View Error PopUp', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${organizationRegistration}`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')
utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse)
})
afterEach(() => {
Expand All @@ -64,6 +71,8 @@ describe('UI Builder - Prettify Code', () => {
context('All Screens - Success Prettier', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')

utils.getScreenSets(datatest.mockGetAllSuccessScreenSets)
})
Expand All @@ -83,6 +92,8 @@ describe('UI Builder - Prettify Code', () => {
context('All Screens - No Javascript on any screen', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')
utils.removeJavascript(datatest.mockGetAllSuccessScreenSets)
utils.getScreenSets(datatest.mockGetAllSuccessScreenSets)
})
Expand All @@ -99,6 +110,8 @@ describe('UI Builder - Prettify Code', () => {
context('All Screens - Javascript error on a single screenSet', () => {
beforeEach(() => {
cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`)
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')
utils.getScreenSets(datatest.mockGetAllSuccessScreenSets)
utils.addErrorOnJavascript(datatest.mockGetAllSuccessScreenSets, liteRegistration)
})
Expand Down
8 changes: 7 additions & 1 deletion cypress/e2e/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
mockedGetWebhookExpectedResponse,
mockedSearchDataflowsResponse,
mockedUserSitesResponse,
mockedGetCommunicationSettingsSearchExpectedResponse,
policiesPopoverText,
siteConfigResponse,
targetSitePopoverText,
Expand All @@ -47,9 +48,13 @@ export function startUp(pageName) {
cy.clearAllCookies()
cy.clearAllLocalStorage()
cy.clearAllSessionStorage()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible')

cy.contains(pageName).click()

cy.contains(pageName).realClick()
cy.reload()
cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click()
}
export function getImportAccountsInformation() {
cy.get('#importAccountsTitle').should('contain.text', importData)
Expand Down Expand Up @@ -169,6 +174,7 @@ export function mockGetConfigurationRequests() {
cy.intercept('POST', 'accounts.getConsentsStatements', { body: mockedGetConsentStatementExpectedResponse }).as('getConsentsStatements')
cy.intercept('POST', 'accounts.communication.getChannels', { body: mockedGetCommunicationChannelsExpectedResponse }).as('communication.getChannels')
cy.intercept('POST', 'accounts.communication.getTopicSettings', { body: mockedGetCommunicationTopicsExpectedResponse }).as('communication.getTopicSettings')
cy.intercept('POST', 'accounts.communications.settings.search', { body: mockedGetCommunicationSettingsSearchExpectedResponse }).as('communication.getComminicationSettingsSearch')
cy.intercept('POST', 'accounts.webhooks.getAll', { body: mockedGetWebhookExpectedResponse }).as('webhooks.getAll')
cy.intercept('POST', 'accounts.extensions.list', { body: mockedGetExtensionExpectedResponse }).as('extensions.list')
cy.intercept('POST', 'accounts.extensions.create', { body: mockedCreateExtensionExpectedResponse }).as('extensions.create')
Expand Down
88 changes: 56 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "sap-customer-data-cloud-toolkit",
"version": "1.11.3",
"version": "1.11.4",
"private": false,
"dependencies": {
"@octokit/rest": "^21.0.2",
"@babel/runtime": "^7.27.0",
"@octokit/rest": "^21.0.2",
"@reduxjs/toolkit": "^1.8.6",
"@sap_oss/automated-usage-tracking-tool": "^1.0.0",
"@sap_oss/automated-usage-tracking-tool": "^1.2.5",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
Expand Down Expand Up @@ -54,7 +54,7 @@
},
"jest": {
"transformIgnorePatterns": [
"node_modules/(?!(@ui5|lit-html|@babel|axios|@octokit|universal-user-agent|before-after-hook)).*\\.js$"
"node_modules/(?!(@ui5|lit-html|@babel|axios|@octokit|universal-user-agent|before-after-hook|uuid|@sap_oss)).*\\.js$"
],
"moduleNameMapper": {
"\\.(css)$": "identity-obj-proxy"
Expand Down Expand Up @@ -113,8 +113,8 @@
"nyc": "^15.1.0",
"prettier": "3.0.0",
"react-scripts": "5.0.1",
"redux-thunk": "^2.4.2",
"release-it": "^19.0.2",
"start-server-and-test": "^2.0.0",
"redux-thunk": "^2.4.2"
"start-server-and-test": "^2.0.0"
}
}
Loading