Skip to content

Commit

Permalink
Merge branch 'develop' into feature/SDPA-3169-update-readme-branding
Browse files Browse the repository at this point in the history 
* develop: (63 commits)
  SDPA-3169 adds new branding (#567)
  v1.3.1
  Update create ripple app (#570)
  [SDPL-96] Split fieldRplSelect into its own component (#566)
  Fixed markup encode issue (#572)
  [SDPA-3207] Added style change for CallToAction to xs screen design. (#557)
  Updated the domain for the MyVIC endpoints in the MyVIC Maps. (#573)
  v1.3.0
  [SDPA-3270] Upgraded Nuxt to v2.9.2 (#561)
  [SDPA-3306] add mapping example (#555)
  [SDPA-3338] Fixed markup decode issue (#562)
  [SDPA-2949] Fix: Search results query to support filter object. (#528)
  [SDPA-3203] Added pagination correct number highlighting fix. (#559)
  [SDPA-3125] Added Flex for the small screen to make it two columns. (#552)
  [SDPA-3174] Added hero banner title size for smal & large screen. (#553)
  [SDPA-3192] Added Wordwrap mixin and used in rpl_banner_title. (#551)
  [SDPA-1967] Updated Honour role apply button text to match the design. (#550)
  [SDPA-2470] Added bottom padding for cta component in xs screen. (#549)
  Fix issues with e2e-vic-gov-au tests (#556)
  v1.3.0-alpha.0
  ...
  • Loading branch information
@tim-yao
tim-yao committed Oct 21, 2019
2 parents c1c8ebd + 4fda96f commit 5a0579b
Show file tree
Hide file tree
Showing 354 changed files with 25,373 additions and 5,880 deletions.
232 changes: 209 additions & 23 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,253 @@
version: 2.0

jobs:
test:
build:
context: Ripple
docker:
- image: cypress/base:10
environment:
TERM: xterm
SEARCH_BE: LOCAL-CI
CIRCLE_TEST_REPORTS: test-results
working_directory: ~/app
steps:
- checkout
- run: yarn --version
- restore_cache:
keys:
- v1-deps-{{ checksum "yarn.lock" }}
- v1-deps-{{ .Branch }}
- v1-deps
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile
- save_cache:
key: v1-deps-{{ checksum "yarn.lock" }}
key: v2-deps-{{ checksum "yarn.lock" }}
paths:
- node_modules
- packages/ripple-nuxt-tide/node_modules
- packages/ripple-nuxt-ui/node_modules
- packages/ripple-create-app/node_modules
- packages/ripple-test-tools/node_modules
- examples/vic-gov-au/node_modules
- examples/basic-examples/node_modules
- examples/vue-example-app/node_modules
- ~/.cache
- run:
name: build vic-gov-au nuxt app
command: cd examples/vic-gov-au && yarn build:default
- persist_to_workspace:
root: ~/app
paths: .

warm-up:
context: Ripple
docker:
- image: cypress/base:10
steps:
- run:
name: Awake dev backend
command: curl https://www.develop.content.vic.gov.au/ --max-time 1000

test:
context: Ripple
docker:
- image: cypress/base:10
environment:
TERM: xterm
CIRCLE_TEST_REPORTS: test-results
working_directory: ~/app
steps:
- attach_workspace:
at: ~/app
- restore_cache:
keys:
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: Lint code.
command: yarn lint
command: yarn lint --format ./node_modules/eslint-junit/index.js
environment:
ESLINT_JUNIT_OUTPUT: ./test-results/lint/eslint.xml
- run:
name: Unit tests
command: yarn test:unit
- run:
command: yarn test:unit --ci --runInBand --reporters=default --reporters=jest-junit
environment:
JEST_JUNIT_OUTPUT_DIR: test-results/unit/
- run:
name: run smoke test
command: yarn test:smoke
- run:
name: prepare cucumber test report
command: yarn test:report
- persist_to_workspace:
root: ~/app
paths: .
- store_test_results:
path: test-results
- store_artifacts:
path: test-results
- store_artifacts:
path: examples/vic-gov-au/test/e2e/videos
- store_artifacts:
path: examples/vic-gov-au/test/e2e/screenshots

e2e-vic-gov:
# This runs the full suite of e2e tests
docker:
- image: cypress/base:10
environment:
TERM: xterm
working_directory: ~/app
steps:
- attach_workspace:
at: ~/app
- restore_cache:
keys:
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: run full e2e test
command: yarn test:e2e-vic
- run:
name: prepare cucumber test report
command: yarn test:report
- store_artifacts:
path: test/e2e/videos
path: test-results
- store_test_results:
path: test-results
- store_artifacts:
path: test/e2e/screenshots
path: examples/vic-gov-au/test/e2e/videos
- store_artifacts:
path: examples/vic-gov-au/test/e2e/screenshots

regression:
e2e-example:
# This runs the full suite of e2e tests
docker:
- image: cypress/base:10
environment:
TERM: xterm
SEARCH_BE: LOCAL-CI
working_directory: ~/app
steps:
- attach_workspace:
at: ~/app
- restore_cache:
keys:
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: build example nuxt app
command: cd examples/basic-examples && yarn build:default
- run:
name: run full e2e test
command: yarn test:e2e
command: yarn test:e2e-example
- run:
name: prepare cucumber test report
command: yarn test:report
- store_test_results:
path: test-results
- store_artifacts:
path: test-results
- store_artifacts:
path: examples/vic-gov-au/test/e2e/videos
- store_artifacts:
path: examples/vic-gov-au/test/e2e/screenshots

e2e-vue-example-app:
docker:
- image: cypress/base:10
environment:
TERM: xterm
working_directory: ~/app
steps:
- attach_workspace:
at: ~/app
- restore_cache:
keys:
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: run smoke test
command: cd examples/vue-example-app && yarn test:smoke
- run:
name: prepare cucumber test report
command: yarn test:report
- store_test_results:
path: test-results
- store_artifacts:
path: test-results
- store_artifacts:
path: test/e2e/videos
path: examples/vue-example-app/test/e2e/videos
- store_artifacts:
path: test/e2e/screenshots
path: examples/vue-example-app/test/e2e/screenshots

prerelease:
# NOT ENABLED YET - needs further testing
docker:
- image: cypress/base:10
environment:
TERM: xterm
working_directory: ~/app
steps:
- attach_workspace:
at: ~/app
- restore_cache:
keys:
- v2-deps-{{ checksum "yarn.lock" }}
- v2-deps-{{ .Branch }}
- v2-deps
- run:
name: Set NPM_TOKEN
command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
- run:
name: Lerna publish
command: yarn publish --dist-tag dev --yes

workflows:
version: 2
commit:
jobs:
- test
# Run full regression test nightly on master and release branches
- build
- test:
requires:
- build
# Run regression tests on release branches
- e2e-vic-gov:
requires:
- build
filters:
branches:
only:
- release/*
- e2e-example:
requires:
- build
filters:
branches:
only:
- release/*
- e2e-vue-example-app:
requires:
- build
filters:
branches:
only:
- release/*
# Release prerelease DEV tag to NPM on successful tests passing
# - prerelease:
# requires:
# - build
# - test
# - e2e-example
# - e2e-vic-gov
# filters:
# branches:
# only:
# - release/*

# Run full regression test at midnight UTC on develop branch
nightly:
triggers:
- schedule:
Expand All @@ -81,7 +257,17 @@ workflows:
only:
- develop
jobs:
- test
# - regression:
# requires:
# - test
- warm-up
- build
- test:
requires:
- build
- e2e-vic-gov:
requires:
- build
- e2e-example:
requires:
- build
- e2e-vue-example-app:
requires:
- build
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ yarn-error.log*
coverage
examples/**/test/e2e/videos
examples/**/test/e2e/screenshots
test-results

# temp test fixtures
/examples/test*
Loading

0 comments on commit 5a0579b

Please sign in to comment.