Skip to content

Commit

Permalink
pushing changes to fix check
Browse files Browse the repository at this point in the history
  • Loading branch information
williamw04 committed Dec 30, 2024
1 parent 4f58471 commit de05934
Show file tree
Hide file tree
Showing 20 changed files with 69 additions and 24 deletions.
8 changes: 6 additions & 2 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { defineConfig } from "cypress";
/* 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 http://mozilla.org/MPL/2.0/. */

import { defineConfig } from "cypress";

export default defineConfig({
e2e: {
Expand All @@ -7,6 +11,6 @@ export default defineConfig({
},
specPattern: 'src/cypress/e2e/*.cy.ts',
supportFile: 'src/cypress/support/e2e.ts',
screenshotsFolder: 'src/cypress/screenshots/e2e',
screenshotsFolder: 'cypress/screenshots/e2e',
},
});
38 changes: 20 additions & 18 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# * License, v. 2.0. If a copy of the MPL was not distributed with this
# * file, You can obtain one at http://mozilla.org/MPL/2.0/.
# *

version: "3.8"
services:
# Database service. It's PostgreSQL, see the
Expand Down Expand Up @@ -82,21 +83,22 @@ services:
# Use this if you are using a docker-compose that is earlier than version 2 and comment out the one above.
# command: ["bash", "./src/scripts/installOED.sh"]

# Cypress testing service
cypress:
image: cypress/included
profiles:
- ui-testing
environment:
- CYPRESS_BASE_URL=http://web:3000
- DISPLAY=:99
working_dir: /usr/src/app
depends_on:
web:
condition: service_healthy
volumes:
- ./:/usr/src/app
entrypoint: >
/bin/sh -c "
rm -f /tmp/.X99-lock &&
Xvfb :99 -screen 0 1024x768x16"
# Cypress testing service
cypress:
image: cypress/included
profiles:
- ui-testing
environment:
- CYPRESS_BASE_URL=http://web:3000
- DISPLAY=:99
working_dir: /usr/src/app
depends_on:
web:
condition: service_healthy
volumes:
- ./:/usr/src/app
entrypoint: >
/bin/sh -c "
rm -f /tmp/.X99-lock &&
Xvfb :99 -screen 0 1024x768x16"
4 changes: 4 additions & 0 deletions src/cypress/e2e/general_ui.cy.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* 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 http://mozilla.org/MPL/2.0/. */

describe('UI Functionality Tests for Open Energy Dashboard', () => {
beforeEach(() => {
// Visit the page before each test
Expand Down
4 changes: 4 additions & 0 deletions src/cypress/e2e/hideOptions.cy.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* 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 http://mozilla.org/MPL/2.0/. */

describe("Options Menu Tests", () => {
beforeEach(() => {
// Visit the OED application
Expand Down
6 changes: 5 additions & 1 deletion src/cypress/e2e/initLangTest.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
describe("Language Selector Tests", () => {
/* 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 http://mozilla.org/MPL/2.0/. */

describe("Language Selector Tests", () => {
beforeEach(() => {
// Visit the OED application
cy.visit("/");
Expand Down
3 changes: 3 additions & 0 deletions src/cypress/e2e/line.cy.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* 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 http://mozilla.org/MPL/2.0/. */

describe('template spec', () => {
beforeEach(() => {
Expand Down
4 changes: 4 additions & 0 deletions src/cypress/e2e/pagesGroups.cy.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* 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 http://mozilla.org/MPL/2.0/. */

describe("Navigation to Groups Page", () => {
beforeEach(() => {
// Visit the application home page
Expand Down
6 changes: 5 additions & 1 deletion src/cypress/e2e/pagesMeters.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
describe("Navigation to Meters Page", () => {
/* 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 http://mozilla.org/MPL/2.0/. */

describe("Navigation to Meters Page", () => {
beforeEach(() => {
// Visit the application home page
cy.visit("/");
Expand Down
6 changes: 5 additions & 1 deletion src/cypress/e2e/test.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
describe("template spec", () => {
/* 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 http://mozilla.org/MPL/2.0/. */

describe("template spec", () => {
beforeEach(() => {
// Visit the OED application
cy.visit("/");
Expand Down
6 changes: 5 additions & 1 deletion src/cypress/e2e/tooltipIcon.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
describe('Tooltip Attribute Test', () => {
/* 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 http://mozilla.org/MPL/2.0/. */

describe('Tooltip Attribute Test', () => {
it('should add aria-describedby attribute after clicking the element', () => {
// Visit the page
cy.visit('/');
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions src/cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* 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 http://mozilla.org/MPL/2.0/. */

/// <reference types="cypress" />
// ***********************************************
// This example commands.ts shows you how to
Expand Down
4 changes: 4 additions & 0 deletions src/cypress/support/e2e.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* 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 http://mozilla.org/MPL/2.0/. */

// ***********************************************************
// This example support/e2e.ts is processed and
// loaded automatically before your test files.
Expand Down

0 comments on commit de05934

Please sign in to comment.