Skip to content

Commit

Permalink
Update project to angular 16
Browse files Browse the repository at this point in the history
  • Loading branch information
michelu89 committed Aug 18, 2023
1 parent a38fdd8 commit 37c94ec
Show file tree
Hide file tree
Showing 269 changed files with 18,792 additions and 14,193 deletions.
28 changes: 28 additions & 0 deletions core/apps/ame-e2e/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "ame-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ame-e2e/src",
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "cypress.config.js",
"devServerTarget": "ame:serve:development",
"tsConfig": "apps/ame-e2e/tsconfig.cypress.json"
},
"configurations": {
"production": {
"devServerTarget": "ame:serve-coverage:production"
}
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/ame-e2e/**/*.{js,ts}"]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
#
# See the AUTHORS file(s) distributed with this work for
# additional information regarding authorship.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
#
# SPDX-License-Identifier: MPL-2.0

@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <urn:samm:org.eclipse.digitaltwin:1.0.0#> .
@prefix different: <urn:samm:org.eclipse.different:1.0.0#> .

:AspectDefault a samm:Aspect ;
samm:properties ( :property1 ) ;
samm:operations ( ) ;
samm:events ( ) .

:property1 a samm:Property ;
samm:characteristic :Characteristic1 .

:Characteristic1 a samm:Characteristic ;
samm:dataType :Entity1 .

:Entity1 a samm:Entity ;
samm:properties ( different:childrenProperty1 ) .

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/// <reference types="Cypress" />

import {
SELECTOR_ecAspect,
SELECTOR_ecCharacteristic,
SELECTOR_ecConstraint,
SELECTOR_ecEntity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable cypress/no-unnecessary-waiting */
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
*
Expand Down Expand Up @@ -111,7 +112,7 @@ describe('Create and Edit Abstract Entity', () => {
.clickShape('Characteristic1') // To lost focus on AbstractEntity2
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
.then(() => cy.get(SELECTOR_notificationsButton).click({force: true}))
.then(() => cy.wait(500).get('.mat-cell').contains('Recursive elements').should('exist'))
.then(() => cy.wait(500).get('.mat-mdc-cell').contains('Recursive elements').should('exist'))
.then(() => cy.wait(500).get('[data-cy="close-notifications"]').click({force: true}));
});

Expand Down Expand Up @@ -145,9 +146,9 @@ describe('Create and Edit Abstract Entity', () => {
cy.clickConnectShapes('AbstractEntity1', 'abstractProperty1')
.then(() => cy.dbClickShape('AbstractEntity1'))
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
.then(() => cy.get('.mat-cell').should('contain', 'abstractProperty1'))
.then(() => cy.get('.mat-cell').get('input').should('not.be.disabled'))
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click())
.then(() => cy.get('.mat-mdc-cell').should('contain', 'abstractProperty1'))
.then(() => cy.get('.mat-mdc-cell').get('input').should('not.be.disabled'))
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click())
.then(() => cy.get(SELECTOR_editorCancelButton).click({force: true}));
});

Expand All @@ -157,9 +158,9 @@ describe('Create and Edit Abstract Entity', () => {
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
.then(() => cy.dbClickShape('AbstractEntity2'))
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
.then(() => cy.get('.mat-cell').should('contain', 'abstractProperty1'))
.then(() => cy.get('.mat-cell').get('input').should('be.disabled'))
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click());
.then(() => cy.get('.mat-mdc-cell').should('contain', 'abstractProperty1'))
.then(() => cy.get('.mat-mdc-cell').get('input').should('be.disabled'))
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click());
});
});

Expand All @@ -173,9 +174,9 @@ describe('Create and Edit Abstract Entity', () => {
cy.clickConnectShapes('AbstractEntity1', 'property1')
.then(() => cy.dbClickShape('AbstractEntity1'))
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
.then(() => cy.get('.mat-cell').should('contain', 'property1'))
.then(() => cy.get('.mat-cell').get('input').should('not.be.disabled'))
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click())
.then(() => cy.get('.mat-mdc-cell').should('contain', 'property1'))
.then(() => cy.get('.mat-mdc-cell').get('input').should('not.be.disabled'))
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click())
.then(() => cy.get(SELECTOR_editorCancelButton).click({force: true}))
.then(() => cy.getUpdatedRDF())
.then(rdf => expect(rdf).to.contain(':AbstractEntity1 a samm:AbstractEntity;\n samm:properties (:property1).'));
Expand All @@ -187,9 +188,9 @@ describe('Create and Edit Abstract Entity', () => {
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
.then(() => cy.dbClickShape('AbstractEntity2'))
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
.then(() => cy.get('.mat-cell').should('contain', 'property1'))
.then(() => cy.get('.mat-cell').get('input').should('be.disabled'))
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click());
.then(() => cy.get('.mat-mdc-cell').should('contain', 'property1'))
.then(() => cy.get('.mat-mdc-cell').get('input').should('be.disabled'))
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click());
});
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable cypress/no-unnecessary-waiting */
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
*
Expand All @@ -24,7 +25,6 @@ import {
SELECTOR_ecAbstractEntity,
SELECTOR_ecProperty,
SELECTOR_ecEntity,
SELECTOR_editorCancelButton,
} from '../../support/constants';

describe('Create and Edit Abstract Property', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable cypress/no-unnecessary-waiting */
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
*
Expand All @@ -21,7 +22,6 @@ import {
SELECTOR_tbDeleteButton,
} from '../../support/constants';
import {cyHelp} from '../../support/helpers';
import {Aspect} from '@ame/meta-model';

describe('Test editing Aspect', () => {
it('can add new', () => {
Expand Down
Loading

0 comments on commit 37c94ec

Please sign in to comment.