From d5b6f3095e302530f04dbb707c337e06c8fad75d Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 31 Jan 2020 14:12:35 +0000 Subject: [PATCH] ui: Move CI to use the Makefile for testing (+ tmporary removal of exam) (#7188) * ui: Move CI to use the Makefile for testing (+ tmporary removal of exam) * ui: make a specific test-ci target as we are using --path dist --path dist looks for a previous build to test against, in CI this exists as we run a build first, but locally potentially this dist folder doesn't --- .circleci/config.yml | 2 +- ui-v2/GNUmakefile | 3 +++ ui-v2/package.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9396e49011..4413c72b2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -506,7 +506,7 @@ jobs: at: ui-v2 - run: working_directory: ui-v2 - command: node_modules/ember-cli/bin/ember exam --split=$CIRCLE_NODE_TOTAL --partition=`expr $CIRCLE_NODE_INDEX + 1` --path dist --silent -r xunit + command: make test-ci - store_test_results: path: ui-v2/test-results diff --git a/ui-v2/GNUmakefile b/ui-v2/GNUmakefile index fdc401c958..ed8b59f1da 100644 --- a/ui-v2/GNUmakefile +++ b/ui-v2/GNUmakefile @@ -38,6 +38,9 @@ start-api: deps test: deps test-node yarn run test +test-ci: deps test-node + yarn run test:ci + test-view: deps test-node yarn run test:view diff --git a/ui-v2/package.json b/ui-v2/package.json index 35f8b58749..14cff9b313 100644 --- a/ui-v2/package.json +++ b/ui-v2/package.json @@ -22,6 +22,7 @@ "start:consul": "ember serve --proxy=${CONSUL_HTTP_ADDR:-http://localhost:8500} --port=${EMBER_SERVE_PORT:-4200} --live-reload-port=${EMBER_LIVE_RELOAD_PORT:-7020}", "start:api": "api-double --dir ./node_modules/@hashicorp/consul-api-double", "test": "ember test --test-port=${EMBER_TEST_PORT:-7357}", + "test:ci": "ember test --test-port=${EMBER_TEST_PORT:-7357} --path dist --silent --reporter xunit", "test:parallel": "EMBER_EXAM_PARALLEL=true ember exam --split=4 --parallel", "test:view": "ember test --server --test-port=${EMBER_TEST_PORT:-7357}", "test:node": "tape ./node-tests/**/*.js",