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
38 changes: 35 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ deploy_defaults: &deploy_defaults
docker:
- image: cimg/python:3.10.2

test_defaults: &test_defaults
docker:
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge

install_build_dependency: &install_build_dependency
name: Installation of build and deployment dependencies.
command: |
apt update
apt install jq -y
apt install python3-pip -y
apt install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb -y
pip3 install awscli --upgrade

install_dependency: &install_dependency
Expand All @@ -37,7 +40,6 @@ save_cache_settings: &save_cache_settings
key: connect-node-modules-{{ checksum "yarn.lock" }}
paths:
- node_modules
- /root/.cache/Cypress

running_yarn_tslint: &running_yarn_tslint
name: Running Yarn tslint
Expand All @@ -49,6 +51,12 @@ running_yarn_build: &running_yarn_build
name: Running Yarn Build
command: |
source buildenvvar
yarn install
yarn build

running_yarn_test: &running_yarn_test
name: Running Yarn Test Build
command: |
yarn install
yarn cypress install
yarn build
Expand Down Expand Up @@ -83,6 +91,20 @@ build_steps: &build_steps
- run: *install_deploysuite
- run: *build_configuration_fetch
- run: *running_yarn_build
- persist_to_workspace: *workspace_persist

test_steps: &test_steps
# Initialization.
- checkout
- setup_remote_docker
- restore_cache:
key: test-node-modules-{{ checksum "yarn.lock" }}
- run: *running_yarn_test
- save_cache:
key: test-node-modules-{{ checksum "yarn.lock" }}
paths:
- node_modules
- /root/.cache/Cypress
- store_test_results:
path: cypress/test-report
- store_artifacts:
Expand All @@ -91,7 +113,6 @@ build_steps: &build_steps
path: cypress/videos
- store_artifacts:
path: cypress/screenshots
- persist_to_workspace: *workspace_persist

deploy_steps: &deploy_steps
- checkout
Expand Down Expand Up @@ -139,6 +160,14 @@ jobs:
LOGICAL_ENV: "prod"
APPNAME: "platform-ui-mvp"
steps: *build_steps

test-dev:
<<: *test_defaults
environment:
DEPLOY_ENV: "DEV"
LOGICAL_ENV: "dev"
APPNAME: "platform-ui-mvp"
steps: *test_steps

# Just tests commited code.
deployDev:
Expand Down Expand Up @@ -208,3 +237,6 @@ workflows:
branches:
only:
- master

- test-dev:
context : org-global
3 changes: 1 addition & 2 deletions cypress/e2e/home/home.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ describe('Landing Page', () => {

beforeEach(() => cy.visit('/'))

// TCA-336 temporarily skip this bc the site isn't loading
it.skip('loads landing page should be successfully', () => {
it('loads landing page should be successfully', () => {
cy.get('[data-id="root"]').should('be.visible')
})

Expand Down