status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Test Coverage Reporting (#7027) 

* Serve up the /coverage folder whilst developing

* Upgrade ember-cli-api-double now it supports passthrough per url
This commit is contained in:
John Cowen 2020-02-10 10:04:55 +00:00 committed by John Cowen
parent 7bca634087
commit 79156324bf
8 changed files with 120 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.circleci/config.yml
View File

@ -489,6 +489,23 @@ jobs:
command: make test-ci
- store_test_results:
path: ui-v2/test-results
# run ember frontend unit tests to produce coverage report
ember-coverage:
docker:
- image: *EMBER_IMAGE
steps:
- checkout
- restore_cache:
key: *YARN_CACHE_KEY
- attach_workspace:
at: ui-v2
- run:
working_directory: ui-v2
command: make test-coverage
- run:
name: codecov ui upload
working_directory: ui-v2
command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui
envoy-integration-test-1.11.2:
docker:
@ -682,6 +699,9 @@ workflows:
- ember-test-ent:
requires:
- ember-build
- ember-coverage:
requires:
- ember-build
cherry-pick:
jobs:
- cherry-picker:

6
codecov.yml
View File

@ -10,6 +10,8 @@ coverage:
# https://docs.codecov.io/docs/commit-status#section-excluding-tests-example-
# TODO: should any paths be excluded from coverage metrics?
# paths:
ui:
informational: true
# https://docs.codecov.io/docs/commit-status#section-changes-status
# TODO: enable after eliminating current unexpected coverage changes?
changes: off
@ -29,7 +31,9 @@ comment: false
# https://docs.codecov.io/docs/flags
# TODO: split out test coverage for API, SDK, UI, website?
# flags:
flags:
ui:
paths: /ui-v2/
ignore:
- "agent/bindata_assetfs.go"

11
ui-v2/GNUmakefile
View File

@ -65,6 +65,17 @@ test-oss-ci: deps test-node
test-node:
yarn run test:node
# This seems to be the only way to only include a subset of files for coverage
# Right now we only want the /app/utils/ folder to be included for coverage
specify-coverage:
sed -i "s/exclude, include/include: ['consul-ui\/utils\/**\/*','consul-ui\/search\/**\/*']/g" ./node_modules/ember-cli-code-coverage/index.js
test-coverage: deps specify-coverage
yarn run test:coverage
test-view-coverage: deps specify-coverage
yarn run test:view:coverage
test-parallel: deps
yarn run test:parallel

8
ui-v2/config/environment.js
View File

@ -90,7 +90,9 @@ module.exports = function(environment, $ = process.env) {
'@hashicorp/ember-cli-api-double': {
'auto-import': false,
enabled: true,
endpoints: ['/node_modules/@hashicorp/consul-api-double/v1'],
endpoints: {
'/v1': '/node_modules/@hashicorp/consul-api-double/v1',
},
},
APP: Object.assign({}, ENV.APP, {
LOG_ACTIVE_GENERATION: false,
@ -106,7 +108,9 @@ module.exports = function(environment, $ = process.env) {
CONSUL_NSPACES_ENABLED: true,
'@hashicorp/ember-cli-api-double': {
enabled: true,
endpoints: ['/node_modules/@hashicorp/consul-api-double/v1'],
endpoints: {
'/v1': '/node_modules/@hashicorp/consul-api-double/v1',
},
},
});
break;

5
ui-v2/lib/startup/index.js
View File

@ -11,10 +11,15 @@ const apiDouble = require('@hashicorp/api-double');
const apiDoubleHeaders = require('@hashicorp/api-double/lib/headers');
const cookieParser = require('cookie-parser');
const bodyParser = require('body-parser');
const express = require('express');
//
module.exports = {
name: 'startup',
serverMiddleware: function(server) {
// Serve the coverage folder for easy viewing during development
server.app.use('/coverage', express.static('coverage'));
// TODO: This should all be moved out into ember-cli-api-double
// and we should figure out a way to get to the settings here for
// so we can set this path name centrally in config

7
ui-v2/package.json
View File

@ -29,8 +29,8 @@
"test:view": "ember test --server --test-port=${EMBER_TEST_PORT:-7357}",
"test:oss:view": "CONSUL_NSPACES_ENABLED=0 ember test --server --test-port=${EMBER_TEST_PORT:-7357}",
"test:node": "tape ./node-tests/**/*.js",
"test:coverage": "COVERAGE=true ember test --test-port=${EMBER_TEST_PORT:-7357}",
"test:view:coverage": "COVERAGE=true ember test --server --test-port=${EMBER_TEST_PORT:-7357}",
"test:coverage": "COVERAGE=true ember test --environment test --filter=Unit --test-port=${EMBER_TEST_PORT:-7357}",
"test:view:coverage": "COVERAGE=true ember test --server --environment test --filter=Unit --test-port=${EMBER_TEST_PORT:-7357}",
"steps:list": "node ./lib/commands/bin/list.js"
},
"husky": {
@ -54,7 +54,7 @@
"@ember/jquery": "^0.6.0",
"@ember/optional-features": "^0.7.0",
"@hashicorp/consul-api-double": "^2.6.2",
"@hashicorp/ember-cli-api-double": "^2.0.0",
"@hashicorp/ember-cli-api-double": "^3.0.0",
"base64-js": "^1.3.0",
"broccoli-asset-rev": "^3.0.0",
"chalk": "^2.4.2",
@ -111,6 +111,7 @@
"loader.js": "^4.7.0",
"ngraph.graph": "^18.0.3",
"node-sass": "^4.9.3",
"pretender": "^3.2.0",
"prettier": "^1.10.2",
"qunit-dom": "^0.9.0",
"tape": "^4.13.0",

5
ui-v2/tests/helpers/api.js
View File

@ -5,10 +5,7 @@ import setCookies from 'consul-ui/tests/helpers/set-cookies';
import typeToURL from 'consul-ui/tests/helpers/type-to-url';
const addon = config['@hashicorp/ember-cli-api-double'];
const temp = addon.endpoints[0].split('/');
temp.pop();
const path = temp.join('/');
const api = apiDouble(path, setCookies, typeToURL);
const api = apiDouble(addon, setCookies, typeToURL);
export const get = function(_url, options = { headers: { cookie: {} } }) {
const url = new URL(_url, 'http://localhost');
return new Promise(function(resolve) {

91
ui-v2/yarn.lock
View File

@ -978,7 +978,7 @@
"@glimmer/interfaces" "^0.42.0"
"@glimmer/util" "^0.42.0"
"@hashicorp/api-double@^1.3.0":
"@hashicorp/api-double@^1.6.1":
version "1.6.1"
resolved "https://registry.yarnpkg.com/@hashicorp/api-double/-/api-double-1.6.1.tgz#67c4c4c5cbf9f51f3b8bc992ab2df21acf63b318"
integrity sha512-JkQZIsH/2B9T2oK5SQNDakvqlHjxQHu0I9ftmmrxqkxYvYoLN+Whp7dzQ8HswOp1vIJyqbvUhSw06XfH/eimZA==
@ -996,19 +996,19 @@
resolved "https://registry.yarnpkg.com/@hashicorp/consul-api-double/-/consul-api-double-2.12.0.tgz#725078f770bbd0ef75a5f2498968c5c8891f90a2"
integrity sha512-8OcgesUjWQ8AjaXzbz3tGJQn1kM0sN6pLidGM7isNPUyYmIjIEXQzaeUQYzsfv0N2Ko9ZuOXYUsaBl8IK1KGow==
"@hashicorp/ember-cli-api-double@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@hashicorp/ember-cli-api-double/-/ember-cli-api-double-2.0.0.tgz#259b13c89150b852f2ebe3b7c182dd16d3ee4c42"
integrity sha512-ZQ+0exG43jnuxEg5dkPkdsaRPX3je5AU+0KQUOmIug6KQ21nSw3KXmMj9+z6dGymdYBaiXaMY2WNTtj+r1Ajuw==
"@hashicorp/ember-cli-api-double@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@hashicorp/ember-cli-api-double/-/ember-cli-api-double-3.0.0.tgz#2a9e8e475c8ac9780221f46584297640870f9f1c"
integrity sha512-3jpkkB0jsVWbpI3ySsBJ5jmSb1bPkJu8nZTh9YvIiQDhH76zqHY7AXi35oSV4M83f5qYtBLJjDSdwrf0zJ9Dlg==
dependencies:
"@hashicorp/api-double" "^1.3.0"
"@hashicorp/api-double" "^1.6.1"
array-range "^1.0.1"
broccoli-file-creator "^2.1.1"
broccoli-merge-trees "^3.0.2"
ember-auto-import "^1.4.0"
ember-auto-import "^1.5.3"
ember-cli-babel "^6.6.0"
merge-options "^1.0.1"
pretender "^2.0.0"
pretender "^3.2.0"
recursive-readdir-sync "^1.0.6"
"@mrmlnc/readdir-enhanced@^2.2.1":
@ -1273,11 +1273,6 @@
"@webassemblyjs/wast-parser" "1.7.11"
"@xtuc/long" "4.2.1"
"@xg-wang/whatwg-fetch@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@xg-wang/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#f7b222c012a238e7d6e89ed3d72a1e0edb58453d"
integrity sha512-ULtqA6L75RLzTNW68IiOja0XYv4Ebc3OGMzfia1xxSEMpD0mk/pMvkQX0vbCFyQmKc5xGp80Ms2WiSlXLh8hbA==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@ -4390,6 +4385,40 @@ ember-auto-import@^1.2.13, ember-auto-import@^1.4.0:
walk-sync "^0.3.3"
webpack "~4.28"
ember-auto-import@^1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.3.tgz#b32936f874d1ed7057ad2ed3f6116357820be44b"
integrity sha512-7JfdunM1BmLy/lyUXu7uEoi0Gi4+dxkGM23FgIEyW5g7z4MidhP53Fc61t49oPSnq7+J4lLpbH1f6C+mDMgb4A==
dependencies:
"@babel/core" "^7.1.6"
"@babel/preset-env" "^7.0.0"
"@babel/traverse" "^7.1.6"
"@babel/types" "^7.1.6"
"@embroider/core" "^0.4.3"
babel-core "^6.26.3"
babel-loader "^8.0.6"
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-template "^6.26.0"
babylon "^6.18.0"
broccoli-debug "^0.6.4"
broccoli-plugin "^1.3.0"
debug "^3.1.0"
ember-cli-babel "^6.6.0"
enhanced-resolve "^4.0.0"
fs-extra "^6.0.1"
fs-tree-diff "^1.0.0"
handlebars "^4.3.1"
js-string-escape "^1.0.1"
lodash "^4.17.10"
mkdirp "^0.5.1"
pkg-up "^2.0.0"
resolve "^1.7.1"
rimraf "^2.6.2"
symlink-or-copy "^1.2.0"
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^0.3.3"
webpack "~4.28"
ember-basic-dropdown@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-1.1.3.tgz#0506045ccc60db4972fc78b963c1324f6415818a"
@ -5781,10 +5810,10 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
fake-xml-http-request@~2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.0.1.tgz#e4a7f256af055d8059deb23c9d7ae721d28cf078"
integrity sha512-KzT+G4aLM1Btg25QRGxB6yGLGOVZXXzrH8I4OG3KHwsdoqFclyW3alieqh5NaYGcmbQvNOn/ldGO1rGKf7CNdA==
fake-xml-http-request@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.1.tgz#279fdac235840d7a4dff77d98ec44bce9fc690a6"
integrity sha512-Kn2WYYS6cDBS5jq/voOfSGCA0TafOYAUPbEp8mUVpD/DVV5bQIDjlq+MLLvNUokkbTpjBVlLDaM5PnX+PwZMlw==
faker@^4.1.0:
version "4.1.0"
@ -6529,6 +6558,17 @@ handlebars@^4.0.11, handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.1.2:
optionalDependencies:
uglify-js "^3.1.4"
handlebars@^4.3.1:
version "4.7.2"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz#01127b3840156a0927058779482031afe0e730d7"
integrity sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw==
dependencies:
neo-async "^2.6.0"
optimist "^0.6.1"
source-map "^0.6.1"
optionalDependencies:
uglify-js "^3.1.4"
handlebars@~4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
@ -9447,14 +9487,14 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
pretender@^2.0.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/pretender/-/pretender-2.1.2.tgz#02d7c0a3f18cb0ce376dfc4fb0043ca288f50316"
integrity sha512-5Jx7kBalWDn8oEKfw6nAcx2KK4GkDSQXG3WhgaPsDtak6Rv6nTeQjOdvOM9PEvauS+9Ur+DLfZTDWBtqK6lFVA==
pretender@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.2.0.tgz#3e653009462f737c1184ca8b7b8d2f03cf47421b"
integrity sha512-YnqYFZ9JKcpseQnYE5iR1y1gBATtJTXzI/SXtTFt4mvXabg6U4AIzvNzJok9IhxP5lIyQ9OeWCsg2DkjhQJSKg==
dependencies:
"@xg-wang/whatwg-fetch" "^3.0.0"
fake-xml-http-request "~2.0.0"
fake-xml-http-request "^2.1.1"
route-recognizer "^0.3.3"
whatwg-fetch "^3.0.0"
prettier@^1.10.2:
version "1.18.2"
@ -11805,6 +11845,11 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
dependencies:
iconv-lite "0.4.24"
whatwg-fetch@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
whatwg-mimetype@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"