From 7874817710a47b6c5ea0994f433ad35c07e9409b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 16 Nov 2020 14:39:06 -0500 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20execute=20linting=20and?= =?UTF-8?q?=20testing=20with=20npm-run-all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 24 +++++++++---------- ui/core/app/styles/app.scss | 6 ++--- ui/core/package.json | 4 ++-- ui/desktop/package.json | 2 +- .../tests/acceptance/authentication-test.js | 12 +++++----- ui/desktop/tests/acceptance/origin-test.js | 16 ++++++------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index e441ae8e3..a2778a5e0 100644 --- a/package.json +++ b/package.json @@ -19,18 +19,18 @@ "build": "yarn build:ui:core", "build:ui:core": "cd ui/core && yarn build", "build:ui:desktop": "cd ui/desktop && yarn build", - "lint": "yarn lint:addons:api && yarn lint:addons:auth && yarn lint:addons:rose && yarn lint:ui:core", - "lint:addons:api": "echo \"\n\nlint: addons/api\n\" && cd addons/api && yarn lint", - "lint:addons:auth": "echo \"\n\nlint: addons/auth\n\" && cd addons/auth && yarn lint", - "lint:addons:rose": "echo \"\n\nlint: addons/rose\n\" && cd addons/rose && yarn lint", - "lint:ui:core": "echo \"\n\nlint: ui/core\n\" && cd ui/core && yarn lint", - "lint:ui:desktop": "echo \"\n\nlint: ui/desktop\n\" && cd ui/desktop && yarn lint", - "test": "yarn test:addons:api && yarn test:addons:auth && yarn test:addons:rose && yarn test:ui:core", - "test:addons:api": "echo \"\n\ntest: addons/api\n\" && cd addons/api && yarn test", - "test:addons:auth": "echo \"\n\ntest: addons/auth\n\" && cd addons/auth && yarn test", - "test:addons:rose": "echo \"\n\ntest: addons/rose\n\" && cd addons/rose && yarn test", - "test:ui:core": "echo \"\n\ntest: ui/core\n\" && cd ui/core && yarn test", - "test:ui:desktop": "echo \"\n\ntest: ui/desktop\n\" && cd ui/desktop && yarn test", + "lint": "npm-run-all lint:*", + "lint:addons-api": "cd addons/api && yarn lint", + "lint:addons-auth": "cd addons/auth && yarn lint", + "lint:addons-rose": "cd addons/rose && yarn lint", + "lint:ui-core": "cd ui/core && yarn lint", + "lint:ui-desktop": "cd ui/desktop && yarn lint", + "test": "npm-run-all test:*", + "test:addons-api": "cd addons/api && yarn test", + "test:addons-auth": "cd addons/auth && yarn test", + "test:addons-rose": "cd addons/rose && yarn test", + "test:ui-core": "cd ui/core && yarn test", + "test:ui-desktop": "cd ui/desktop && yarn test", "compliance:audit": "bash ./scripts/yarn-audit.sh", "precommit": "yarn compliance:licenses && yarn compliance:audit && yarn lint && yarn test", "commit": "git-cz", diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index a41d1236f..134df4cd9 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -44,8 +44,8 @@ } .rose-dropdown { - $iconWidth: sizing.rems(m) + sizing.rems(s); - $indent: $iconWidth + sizing.rems(xs); + $icon-width: sizing.rems(m) + sizing.rems(s); + $indent: $icon-width + sizing.rems(xs); .rose-form-radio-label { display: flex; @@ -63,7 +63,7 @@ .indent-label-2 { .rose-form-radio-label { - padding-left: $indent + $iconWidth; + padding-left: $indent + $icon-width; } } diff --git a/ui/core/package.json b/ui/core/package.json index 96c2f5201..60689eb7e 100644 --- a/ui/core/package.json +++ b/ui/core/package.json @@ -17,7 +17,7 @@ "lint:hbs": "ember-template-lint .", "lint:js": "eslint .", "lint:sass": "sass-lint -v -q", - "format": "yarn format:js && npm run format:sass", + "format": "npm-run-all format:*", "format:js": "prettier --write '{app,config,stories,tests}/**/*.js' *.js", "format:sass": "prettier --write app/**/*.scss", "start": "ember serve", @@ -87,7 +87,7 @@ "faker": "^4.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.0.5", + "prettier": "^2.1.2", "qunit-dom": "^1.2.0", "rose": "*", "sass": "^1.26.5", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 4fa7d57de..4bd97816f 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -17,7 +17,7 @@ "lint:hbs": "ember-template-lint .", "lint:js": "eslint .", "lint:sass": "sass-lint -v -q", - "format": "yarn format:js && npm run format:sass", + "format": "npm-run-all format:*", "format:js": "prettier --write '{app,config,stories,tests}/**/*.js' *.js", "format:sass": "prettier --write app/**/*.scss", "start": "ember serve", diff --git a/ui/desktop/tests/acceptance/authentication-test.js b/ui/desktop/tests/acceptance/authentication-test.js index c23184a59..2bff4d4eb 100644 --- a/ui/desktop/tests/acceptance/authentication-test.js +++ b/ui/desktop/tests/acceptance/authentication-test.js @@ -2,20 +2,20 @@ import { module, test } from 'qunit'; import { visit, currentURL, - fillIn, - click, + //fillIn, + //click, find, - findAll, - getRootElement + //findAll, + //getRootElement //setupOnerror, } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; -import { Response } from 'miragejs'; +//import { Response } from 'miragejs'; //import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { currentSession, - authenticateSession, + //authenticateSession, invalidateSession, } from 'ember-simple-auth/test-support'; diff --git a/ui/desktop/tests/acceptance/origin-test.js b/ui/desktop/tests/acceptance/origin-test.js index 163975f71..c0b722a03 100644 --- a/ui/desktop/tests/acceptance/origin-test.js +++ b/ui/desktop/tests/acceptance/origin-test.js @@ -2,20 +2,20 @@ import { module, test } from 'qunit'; import { visit, currentURL, - fillIn, - click, - find, - findAll, - getRootElement + //fillIn, + //click, + //find, + //findAll, + //getRootElement //setupOnerror, } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; -import { Response } from 'miragejs'; +//import { Response } from 'miragejs'; //import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { - currentSession, - authenticateSession, + //currentSession, + //authenticateSession, invalidateSession, } from 'ember-simple-auth/test-support';