chore: 🤖 Upgrading to Ember 4.12.2 (#1988)
* chore: 🤖 Upgrading to Ember 4.12.2 Upgrading `admin/ui` to Ember 4.12.2 ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11330 * refactor: 💡 Removed unused package Removed unused `stylelint` package for `css` ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11330 * refactor: 💡 removed unused dependency Removed `stylelint-prettier` dependency ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11330
This commit is contained in:
1 parent
c5edd4dd52
commit
2558ee1353
31 files changed
+184
-141
No files matched your search
@@ -32,7 +32,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.21.0",
|
||||
"@babel/eslint-parser": "^7.18.2",
|
||||
"@babel/eslint-parser": "^7.21.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@ember/optional-features": "^2.0.0",
|
||||
"@ember/string": "^3.0.1",
|
||||
@@ -64,7 +64,7 @@
|
||||
"eslint-plugin-qunit": "^7.3.4",
|
||||
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
|
||||
"loader.js": "^4.7.0",
|
||||
"prettier": "^2.8.7",
|
||||
"prettier": "^3.0.0",
|
||||
"qunit": "^2.19.4",
|
||||
"qunit-dom": "^2.0.0",
|
||||
"webpack": "^5.78.0"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"ember-simple-auth": "^4.2.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/eslint-parser": "^7.18.2",
|
||||
"@babel/eslint-parser": "^7.21.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@ember/optional-features": "^2.0.0",
|
||||
"@ember/string": "^3.0.1",
|
||||
@@ -61,7 +61,7 @@
|
||||
"eslint-plugin-qunit": "^7.3.4",
|
||||
"loader.js": "^4.7.0",
|
||||
"pretender": "^3.4.3",
|
||||
"prettier": "^2.8.7",
|
||||
"prettier": "^3.0.0",
|
||||
"qunit": "^2.19.4",
|
||||
"qunit-dom": "^2.0.0",
|
||||
"webpack": "^5.78.0"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
"intl-unofficial-duration-unit-format": "^3.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/eslint-parser": "^7.18.2",
|
||||
"@babel/eslint-parser": "^7.21.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@ember/optional-features": "^2.0.0",
|
||||
"@ember/string": "^3.0.1",
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
"disableAnalytics": false,
|
||||
|
||||
/**
|
||||
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
|
||||
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
|
||||
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
|
||||
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
|
||||
*/
|
||||
"isTypeScriptProject": false
|
||||
}
|
||||
+15
-19
@@ -9,12 +9,14 @@ module.exports = {
|
||||
root: true,
|
||||
parser: '@babel/eslint-parser',
|
||||
parserOptions: {
|
||||
ecmaVersion: 2018,
|
||||
ecmaVersion: 'latest',
|
||||
sourceType: 'module',
|
||||
// This is specific babel-config. If grows consider creating a babel config file
|
||||
requireConfigFile: false,
|
||||
babelOptions: {
|
||||
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
|
||||
plugins: [
|
||||
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
|
||||
],
|
||||
},
|
||||
// end of babel-config
|
||||
},
|
||||
@@ -34,16 +36,16 @@ module.exports = {
|
||||
// node files
|
||||
{
|
||||
files: [
|
||||
'.eslintrc.js',
|
||||
'.prettierrc.js',
|
||||
'.template-lintrc.js',
|
||||
'.stylelintrc.js',
|
||||
'ember-cli-build.js',
|
||||
'testem.js',
|
||||
'blueprints/*/index.js',
|
||||
'config/**/*.js',
|
||||
'lib/*/index.js',
|
||||
'server/**/*.js',
|
||||
'./.eslintrc.js',
|
||||
'./.prettierrc.js',
|
||||
'./.stylelintrc.js',
|
||||
'./.template-lintrc.js',
|
||||
'./ember-cli-build.js',
|
||||
'./testem.js',
|
||||
'./blueprints/*/index.js',
|
||||
'./config/**/*.js',
|
||||
'./lib/*/index.js',
|
||||
'./server/**/*.js',
|
||||
],
|
||||
parserOptions: {
|
||||
sourceType: 'script',
|
||||
@@ -52,13 +54,7 @@ module.exports = {
|
||||
browser: false,
|
||||
node: true,
|
||||
},
|
||||
plugins: ['node'],
|
||||
extends: ['plugin:node/recommended'],
|
||||
rules: {
|
||||
// this can be removed once the following is fixed
|
||||
// https://github.com/mysticatea/eslint-plugin-node/issues/77
|
||||
'node/no-unpublished-require': 'off',
|
||||
},
|
||||
extends: ['plugin:n/recommended'],
|
||||
},
|
||||
{
|
||||
// Test files:
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
# unconventional files
|
||||
/blueprints/*/files/
|
||||
|
||||
# compiled output
|
||||
/dist/
|
||||
|
||||
# addons
|
||||
/.node_modules.ember-try/
|
||||
@@ -20,4 +20,12 @@ module.exports = {
|
||||
},
|
||||
'no-route-action': false,
|
||||
},
|
||||
overrides: [
|
||||
{
|
||||
files: '**/tests/**/*.{js,gts,gjs}',
|
||||
rules: {
|
||||
prettier: false,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
@@ -178,9 +178,9 @@
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.account.description'}}
|
||||
|
||||
{{else if (can
|
||||
'create model' this.authMethod collection='accounts'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.authMethod collection='accounts')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
+3
-3
@@ -119,9 +119,9 @@
|
||||
}}
|
||||
{{! Can list (at least): show default welcome message }}
|
||||
{{t 'resources.managed-group.description'}}
|
||||
{{else if (can
|
||||
'create model' this.authMethod collection='managed-groups'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.authMethod collection='managed-groups')
|
||||
}}
|
||||
{{! Can create only: show create but not list welcome message }}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -188,9 +188,9 @@
|
||||
</:body>
|
||||
</Hds::Table>
|
||||
|
||||
{{else if (has-resource-filter-selections
|
||||
'scopes.scope.auth-methods' 'type'
|
||||
)}}
|
||||
{{else if
|
||||
(has-resource-filter-selections 'scopes.scope.auth-methods' 'type')
|
||||
}}
|
||||
|
||||
<Rose::Layout::Centered>
|
||||
<Rose::Message @title={{t 'titles.no-results'}} as |message|>
|
||||
@@ -211,9 +211,9 @@
|
||||
{{#if (can 'list model' this.scopeModel collection='auth-methods')}}
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.auth-method.messages.welcome.description'}}
|
||||
{{else if (can
|
||||
'create model' this.scopeModel collection='auth-methods'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.scopeModel collection='auth-methods')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
+7
-5
@@ -94,11 +94,13 @@
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.credential-library.description'}}
|
||||
|
||||
{{else if (can
|
||||
'create model'
|
||||
this.credentialStore
|
||||
collection='credential-libraries'
|
||||
)}}
|
||||
{{else if
|
||||
(can
|
||||
'create model'
|
||||
this.credentialStore
|
||||
collection='credential-libraries'
|
||||
)
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
+3
-3
@@ -83,9 +83,9 @@
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.credential.description'}}
|
||||
|
||||
{{else if (can
|
||||
'create model' this.credentialStore collection='credentials'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.credentialStore collection='credentials')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -92,9 +92,9 @@
|
||||
{{#if (can 'list model' this.scope collection='credential-stores')}}
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.credential-store.description'}}
|
||||
{{else if (can
|
||||
'create model' this.scope collection='credential-stores'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.scope collection='credential-stores')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -76,9 +76,9 @@
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.host-set.description'}}
|
||||
|
||||
{{else if (can
|
||||
'create model' this.hostCatalog collection='host-sets'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.hostCatalog collection='host-sets')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -88,9 +88,9 @@
|
||||
{{#if (can 'list model' this.scope collection='host-catalogs')}}
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.host-catalog.description'}}
|
||||
{{else if (can
|
||||
'create model' this.scope collection='host-catalogs'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create model' this.scope collection='host-catalogs')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -139,9 +139,9 @@
|
||||
</table.body>
|
||||
</Rose::Table>
|
||||
|
||||
{{else if (has-resource-filter-selections
|
||||
'scopes.scope.sessions' 'status'
|
||||
)}}
|
||||
{{else if
|
||||
(has-resource-filter-selections 'scopes.scope.sessions' 'status')
|
||||
}}
|
||||
<Rose::Layout::Centered>
|
||||
<Rose::Message @title={{t 'titles.no-results'}} as |message|>
|
||||
<message.description>
|
||||
|
||||
@@ -135,9 +135,9 @@
|
||||
<message.description>
|
||||
{{#if (can 'list scope' this.scope collection='storage-buckets')}}
|
||||
{{t 'resources.storage-bucket.messages.none.description'}}
|
||||
{{else if (can
|
||||
'create scope' this.scope collection='storage-buckets'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create scope' this.scope collection='storage-buckets')
|
||||
}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
resource=(t 'resources.storage-bucket.title_plural')
|
||||
|
||||
@@ -161,9 +161,9 @@
|
||||
{{#if (can 'list worker' this.scope collection='workers')}}
|
||||
{{! can list (at least): show default welcome message}}
|
||||
{{t 'resources.worker.description'}}
|
||||
{{else if (can
|
||||
'create worker led worker' this.scope collection='workers'
|
||||
)}}
|
||||
{{else if
|
||||
(can 'create worker led worker' this.scope collection='workers')
|
||||
}}
|
||||
{{! can create (only): show create-but-not-list welcome message}}
|
||||
{{t
|
||||
'descriptions.create-but-not-list'
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"packages": [
|
||||
{
|
||||
"name": "ember-cli",
|
||||
"version": "4.4.1",
|
||||
"version": "4.12.2",
|
||||
"blueprints": [
|
||||
{
|
||||
"name": "app",
|
||||
|
||||
@@ -32,15 +32,11 @@ module.exports = function (environment) {
|
||||
rootURL: '/',
|
||||
locationType: 'history',
|
||||
EmberENV: {
|
||||
EXTEND_PROTOTYPES: false,
|
||||
FEATURES: {
|
||||
// Here you can enable experimental features on an ember canary build
|
||||
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
|
||||
},
|
||||
EXTEND_PROTOTYPES: false,
|
||||
/*{
|
||||
// Prevent Ember Data from overriding Date.parse.
|
||||
Date: false
|
||||
}*/
|
||||
},
|
||||
|
||||
APP: {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
|
||||
|
||||
module.exports = function (defaults) {
|
||||
let app = new EmberApp(defaults, {
|
||||
const app = new EmberApp(defaults, {
|
||||
hinting: false,
|
||||
'ember-cli-babel': {
|
||||
includeExternalHelpers: true,
|
||||
|
||||
+29
-28
@@ -16,22 +16,22 @@
|
||||
"build:oss": "EDITION=oss ember build --environment=production",
|
||||
"build:enterprise": "EDITION=enterprise ember build --environment=production",
|
||||
"build:hcp": "EDITION=hcp ember build --environment=production",
|
||||
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
|
||||
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
|
||||
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
|
||||
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
|
||||
"lint:hbs": "ember-template-lint .",
|
||||
"lint:hbs:fix": "ember-template-lint . --fix",
|
||||
"lint:js": "eslint .",
|
||||
"lint:js:fix": "eslint . --fix",
|
||||
"lint:sass": "stylelint 'app/styles/**/*.scss'",
|
||||
"lint:sass:fix": "stylelint 'app/styles/**/*.scss' --fix",
|
||||
"format": "npm-run-all format:*",
|
||||
"format": "concurrently \"npm:format:*\" --names \"format:\"",
|
||||
"format:hbs": "prettier --write 'app/**/*.hbs'",
|
||||
"format:js": "prettier --write '{app,config,stories,tests}/**/*.js' *.js",
|
||||
"format:sass": "prettier --write app/**/*.scss",
|
||||
"lint:js:fix": "eslint . --fix",
|
||||
"start": "ember serve",
|
||||
"clean:coverage": "rm -rf coverage_*",
|
||||
"pretest": "yarn clean:coverage",
|
||||
"test": "npm-run-all test:*",
|
||||
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
|
||||
"test:ember": "COVERAGE=true ember exam --test-port 0 --split=4 --parallel=1 --random",
|
||||
"e2e": "yarn playwright test --config ./tests/e2e/playwright.config.js",
|
||||
"e2e:dev:chrome": "yarn run e2e --project=chromium --headed",
|
||||
@@ -44,11 +44,12 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.18.5",
|
||||
"@babel/eslint-parser": "^7.18.2",
|
||||
"@babel/plugin-proposal-decorators": "^7.18.6",
|
||||
"@babel/eslint-parser": "^7.21.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@ember/optional-features": "^2.0.0",
|
||||
"@ember/render-modifiers": "^2.0.4",
|
||||
"@ember/test-helpers": "^2.8.1",
|
||||
"@ember/string": "^3.0.1",
|
||||
"@ember/test-helpers": "^2.9.3",
|
||||
"@embroider/macros": "^1.13.1",
|
||||
"@faker-js/faker": "^8.0.2",
|
||||
"@glimmer/component": "^1.1.2",
|
||||
@@ -58,52 +59,52 @@
|
||||
"babel-loader": "^8.2.5",
|
||||
"broccoli-asset-rev": "^3.0.0",
|
||||
"clipboard": "^2.0.8",
|
||||
"concurrently": "^8.0.1",
|
||||
"core": "*",
|
||||
"doctoc": "^2.2.0",
|
||||
"ember-a11y-testing": "^4.2.0",
|
||||
"ember-auto-import": "^2.4.2",
|
||||
"ember-cli": "^4.4.1",
|
||||
"ember-cli-app-version": "^5.0.0",
|
||||
"ember-auto-import": "^2.6.3",
|
||||
"ember-cli": "^4.12.2",
|
||||
"ember-cli-app-version": "^6.0.0",
|
||||
"ember-cli-babel": "^7.26.11",
|
||||
"ember-cli-code-coverage": "^1.0.3",
|
||||
"ember-cli-content-security-policy": "^2.0.3",
|
||||
"ember-cli-dependency-checker": "^3.3.1",
|
||||
"ember-cli-flash": "^4.0.0",
|
||||
"ember-cli-htmlbars": "^6.1.0",
|
||||
"ember-cli-htmlbars": "^6.2.0",
|
||||
"ember-cli-inject-live-reload": "^2.1.0",
|
||||
"ember-cli-sass": "^11.0.1",
|
||||
"ember-cli-sri": "^2.1.1",
|
||||
"ember-cli-terser": "^4.0.2",
|
||||
"ember-exam": "^8.0.0",
|
||||
"ember-export-application-global": "^2.0.1",
|
||||
"ember-inline-svg": "^1.0.1",
|
||||
"ember-load-initializers": "^2.1.2",
|
||||
"ember-modifier": "^3.2.7",
|
||||
"ember-modifier": "^4.1.0",
|
||||
"ember-page-title": "^7.0.0",
|
||||
"ember-pollster": "https://github.com/hashicorp/ember-pollster.git#718db797382b04aca281216319885c5ff625f539",
|
||||
"ember-qunit": "^6.0.0",
|
||||
"ember-resolver": "^8.0.3",
|
||||
"ember-source": "~4.4.0",
|
||||
"ember-template-lint": "^4.14.0",
|
||||
"ember-template-lint-plugin-prettier": "^4.0.0",
|
||||
"eslint": "^8.18.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-ember": "^10.6.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-qunit": "^7.3.0",
|
||||
"ember-qunit": "^6.2.0",
|
||||
"ember-resolver": "^10.0.0",
|
||||
"ember-source": "~4.12.0",
|
||||
"ember-template-lint": "^5.7.2",
|
||||
"ember-template-lint-plugin-prettier": "^5.0.0",
|
||||
"eslint": "^8.37.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
"eslint-plugin-ember": "^11.5.0",
|
||||
"eslint-plugin-n": "^15.7.0",
|
||||
"eslint-plugin-qunit": "^7.3.4",
|
||||
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
|
||||
"loader.js": "^4.7.0",
|
||||
"lodash": "4.17.21",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^2.7.1",
|
||||
"qunit": "^2.19.1",
|
||||
"prettier": "^3.0.0",
|
||||
"qunit": "^2.19.4",
|
||||
"qunit-dom": "^2.0.0",
|
||||
"rose": "*",
|
||||
"sinon": "^14.0.0",
|
||||
"stylelint": "^15.10.1",
|
||||
"stylelint-config-prettier-scss": "^0.0.1",
|
||||
"stylelint-config-standard-scss": "^6.0.0",
|
||||
"webpack": "^5.76.0"
|
||||
"tracked-built-ins": "^3.1.1",
|
||||
"webpack": "^5.78.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "16.* || 18.*"
|
||||
|
||||
@@ -12,9 +12,12 @@ module('Integration | Component | copyable', function (hooks) {
|
||||
setupRenderingTest(hooks);
|
||||
|
||||
test('it renders', async function (assert) {
|
||||
this.set('actionText', 'text');
|
||||
|
||||
await render(
|
||||
hbs`<Copyable @buttonText="Copy me" @text="foo">text</Copyable>`
|
||||
hbs`<Copyable @buttonText="Copy me" @text="foo">{{this.actionText}}</Copyable>`,
|
||||
);
|
||||
|
||||
assert.ok(find('.copyable'));
|
||||
assert.strictEqual(find('.copyable-content').textContent.trim(), 'text');
|
||||
assert.strictEqual(find('.copyable-button').textContent.trim(), 'Copy me');
|
||||
|
||||
@@ -15,14 +15,17 @@ module(
|
||||
|
||||
test('it renders', async function (assert) {
|
||||
assert.expect(2);
|
||||
|
||||
this.set('value', 'Skeleton Message');
|
||||
|
||||
await render(hbs`
|
||||
<Form::Field::JsonSecret::Skeleton>
|
||||
Skeleton Message
|
||||
{{this.value}}
|
||||
</Form::Field::JsonSecret::Skeleton>
|
||||
`);
|
||||
|
||||
assert.dom('.secret-editor-skeleton-wrapper').isVisible();
|
||||
assert.dom('.secret-editor-skeleton-message').hasText('Skeleton Message');
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -14,22 +14,21 @@ module('Integration | Component | list-wrapper', function (hooks) {
|
||||
setupIntl(hooks);
|
||||
|
||||
test('it renders fields', async function (assert) {
|
||||
this.error = [
|
||||
{
|
||||
message: 'Error!',
|
||||
},
|
||||
];
|
||||
this.set('label', 'Label');
|
||||
this.set('helperText', 'Help');
|
||||
this.set('error', 'Error!');
|
||||
|
||||
await render(hbs`
|
||||
<Form::Field::ListWrapper>
|
||||
<:fieldset as |F|>
|
||||
<F.Legend>
|
||||
Label
|
||||
{{this.label}}
|
||||
</F.Legend>
|
||||
<F.HelperText>
|
||||
Help
|
||||
{{this.helperText}}
|
||||
</F.HelperText>
|
||||
<F.Error as |E|>
|
||||
<E.Message>Error!</E.Message>
|
||||
<E.Message>{{this.error}}</E.Message>
|
||||
</F.Error>
|
||||
</:fieldset>
|
||||
<:field as |F|>
|
||||
@@ -68,11 +67,11 @@ module('Integration | Component | list-wrapper', function (hooks) {
|
||||
this.options = [{ value: 'one' }, { value: 'three' }];
|
||||
|
||||
await render(hbs`
|
||||
|
||||
|
||||
<Form::Field::ListWrapper>
|
||||
<:field as |F|>
|
||||
<F.TextInput
|
||||
@options={{this.options}}
|
||||
<F.TextInput
|
||||
@options={{this.options}}
|
||||
>
|
||||
</F.TextInput>
|
||||
</:field>
|
||||
@@ -90,11 +89,11 @@ module('Integration | Component | list-wrapper', function (hooks) {
|
||||
this.options = [{ value: 'one' }, { value: 'three' }];
|
||||
|
||||
await render(hbs`
|
||||
|
||||
|
||||
<Form::Field::ListWrapper>
|
||||
<:field as |F|>
|
||||
<F.Textarea
|
||||
@options={{this.options}}
|
||||
@options={{this.options}}
|
||||
>
|
||||
</F.Textarea>
|
||||
</:field>
|
||||
|
||||
@@ -11,16 +11,21 @@ import { hbs } from 'ember-cli-htmlbars';
|
||||
module('Integration | Component | info-field', function (hooks) {
|
||||
setupRenderingTest(hooks);
|
||||
|
||||
hooks.beforeEach(function () {
|
||||
this.set('label', 'Type');
|
||||
this.set('helperText', 'Description');
|
||||
});
|
||||
|
||||
test('it renders without icon', async function (assert) {
|
||||
assert.expect(4);
|
||||
|
||||
await render(
|
||||
hbs`
|
||||
<InfoField @value="JSON" as |F|>
|
||||
<F.Label>Type</F.Label>
|
||||
<F.HelperText>Description</F.HelperText>
|
||||
<F.Label>{{this.label}}</F.Label>
|
||||
<F.HelperText>{{this.helperText}}</F.HelperText>
|
||||
</InfoField>
|
||||
`
|
||||
`,
|
||||
);
|
||||
assert.dom('.info-field').isVisible();
|
||||
assert.dom('.info-field .hds-form-label').hasText('Type');
|
||||
@@ -34,10 +39,10 @@ module('Integration | Component | info-field', function (hooks) {
|
||||
await render(
|
||||
hbs`
|
||||
<InfoField @value="JSON" @icon='apple' as |F|>
|
||||
<F.Label>Type</F.Label>
|
||||
<F.HelperText>Description</F.HelperText>
|
||||
<F.Label>{{this.label}}</F.Label>
|
||||
<F.HelperText>{{this.helperText}}</F.HelperText>
|
||||
</InfoField>
|
||||
`
|
||||
`,
|
||||
);
|
||||
assert.dom('.info-field').isVisible();
|
||||
assert.dom('.info-field .hds-form-label').hasText('Type');
|
||||
|
||||
@@ -16,13 +16,16 @@ module(
|
||||
test('it renders group icons with highlight background', async function (assert) {
|
||||
assert.expect(7);
|
||||
|
||||
this.set('client', 'Client');
|
||||
this.set('egressWorker', 'Egress Worker');
|
||||
|
||||
await render(hbs`
|
||||
<OrderedSeriesDiagram::Group @title='Private Network' @color='highlight'>
|
||||
<OrderedSeriesDiagram::Item @icon='user'>
|
||||
Client
|
||||
{{this.client}}
|
||||
</OrderedSeriesDiagram::Item>
|
||||
<OrderedSeriesDiagram::Item @icon='settings'>
|
||||
Egress Worker
|
||||
{{this.egressWorker}}
|
||||
</OrderedSeriesDiagram::Item>
|
||||
</OrderedSeriesDiagram::Group>
|
||||
`);
|
||||
@@ -41,9 +44,9 @@ module(
|
||||
assert.dom('[data-test-icon="settings"]').isVisible();
|
||||
assert
|
||||
.dom(
|
||||
'.ordered-series-diagram-item:last-child .ordered-series-diagram-item-title'
|
||||
'.ordered-series-diagram-item:last-child .ordered-series-diagram-item-title',
|
||||
)
|
||||
.hasText('Egress Worker');
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -15,10 +15,14 @@ module(
|
||||
|
||||
test('it renders two icon series', async function (assert) {
|
||||
assert.expect(5);
|
||||
|
||||
this.set('client', 'Client');
|
||||
this.set('egressWorker', 'Egress Worker');
|
||||
|
||||
await render(hbs`
|
||||
<OrderedSeriesDiagram as |D|>
|
||||
<D.Item @icon='user'>Client</D.Item>
|
||||
<D.Item @icon='settings'>Egress Worker</D.Item>
|
||||
<D.Item @icon='user'>{{this.client}}</D.Item>
|
||||
<D.Item @icon='settings'>{{this.egressWorker}}</D.Item>
|
||||
</OrderedSeriesDiagram>
|
||||
`);
|
||||
|
||||
@@ -28,9 +32,9 @@ module(
|
||||
assert.dom('[data-test-icon="settings"]').isVisible();
|
||||
assert
|
||||
.dom(
|
||||
'.ordered-series-diagram-item:last-child .ordered-series-diagram-item-title'
|
||||
'.ordered-series-diagram-item:last-child .ordered-series-diagram-item-title',
|
||||
)
|
||||
.hasText('Egress Worker');
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -16,14 +16,16 @@ module(
|
||||
test('it renders with icon and text', async function (assert) {
|
||||
assert.expect(2);
|
||||
|
||||
this.set('client', 'Client');
|
||||
|
||||
await render(hbs`
|
||||
<OrderedSeriesDiagram::Item @icon='user'>
|
||||
Client
|
||||
{{this.client}}
|
||||
</OrderedSeriesDiagram::Item>
|
||||
`);
|
||||
|
||||
assert.dom('[data-test-icon="user"]').isVisible();
|
||||
assert.dom('.ordered-series-diagram-item-title').hasText('Client');
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -26,11 +26,13 @@ module('Integration | Helper | can', function (hooks) {
|
||||
},
|
||||
};
|
||||
|
||||
this.set('read', 'Read');
|
||||
this.set('list', 'List');
|
||||
this.set('model', model);
|
||||
|
||||
await render(hbs`
|
||||
{{#if (can 'read model' this.model)}}
|
||||
Read
|
||||
{{this.read}}
|
||||
{{/if}}
|
||||
`);
|
||||
|
||||
@@ -38,7 +40,7 @@ module('Integration | Helper | can', function (hooks) {
|
||||
|
||||
await render(hbs`
|
||||
{{#if (can 'list model' this.model collection='resource')}}
|
||||
List
|
||||
{{this.list}}
|
||||
{{/if}}
|
||||
`);
|
||||
|
||||
|
||||
@@ -3900,7 +3900,7 @@
|
||||
broccoli-funnel "^3.0.8"
|
||||
semver "^7.3.8"
|
||||
|
||||
"@embroider/addon-shim@^1.8.4":
|
||||
"@embroider/addon-shim@^1.8.3", "@embroider/addon-shim@^1.8.4":
|
||||
version "1.8.6"
|
||||
resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.6.tgz#b676991b4fa32c3a98dc7db7dc6cd655029c3f09"
|
||||
integrity sha512-siC9kP78uucEbpDcVyxjkwa76pcs5rVzDVpWO4PDc9EAXRX+pzmUuSTLAK3GztUwx7/PWhz1BenAivqdSvSgfg==
|
||||
@@ -9683,6 +9683,14 @@ ember-cli-app-version@^5.0.0:
|
||||
ember-cli-babel "^7.23.1"
|
||||
git-repo-info "^2.1.1"
|
||||
|
||||
ember-cli-app-version@^6.0.0:
|
||||
version "6.0.1"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-6.0.1.tgz#401cdd440c7fef2059aa54bbadae9ca581d4faa0"
|
||||
integrity sha512-XA1FwkWA5QytmWF0jcJqEr3jcZoiCl9Fb33TZgOVfClL7Voxe+/RwzISEprBRQgbf7j8z1xf8/RJCKfclUy3rQ==
|
||||
dependencies:
|
||||
ember-cli-babel "^7.26.11"
|
||||
git-repo-info "^2.1.1"
|
||||
|
||||
ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
|
||||
@@ -10822,7 +10830,7 @@ ember-modifier-manager-polyfill@^1.2.0:
|
||||
ember-cli-typescript "^5.0.0"
|
||||
ember-compatibility-helpers "^1.2.5"
|
||||
|
||||
"ember-modifier@^3.2.7 || ^4.0.0":
|
||||
"ember-modifier@^3.2.7 || ^4.0.0", ember-modifier@^4.1.0:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.1.0.tgz#cb91efbf8ca4ff4a1a859767afa42dddba5a2bbd"
|
||||
integrity sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ==
|
||||
@@ -11147,7 +11155,7 @@ ember-template-recast@^6.1.3, ember-template-recast@^6.1.4:
|
||||
tmp "^0.2.1"
|
||||
workerpool "^6.4.0"
|
||||
|
||||
ember-tracked-storage-polyfill@1.0.0:
|
||||
ember-tracked-storage-polyfill@1.0.0, ember-tracked-storage-polyfill@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/ember-tracked-storage-polyfill/-/ember-tracked-storage-polyfill-1.0.0.tgz#84d307a1e4badc5f84dca681db2cfea9bdee8a77"
|
||||
integrity sha512-eL7lZat68E6P/D7b9UoTB5bB5Oh/0aju0Z7PCMi3aTwhaydRaxloE7TGrTRYU+NdJuyNVZXeGyxFxn2frvd3TA==
|
||||
@@ -18110,11 +18118,6 @@ prettier@^2.5.1, prettier@^2.7.1:
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
|
||||
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
|
||||
|
||||
prettier@^2.8.7:
|
||||
version "2.8.8"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
|
||||
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
|
||||
|
||||
prettier@^3.0.0:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
|
||||
@@ -21096,6 +21099,14 @@ tr46@~0.0.3:
|
||||
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
|
||||
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
|
||||
|
||||
tracked-built-ins@^3.1.1:
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/tracked-built-ins/-/tracked-built-ins-3.3.0.tgz#3c8d780550658fe180d0ec32754f1eef1966f2d9"
|
||||
integrity sha512-ewKFrW/AQs05oLPM5isOUb/1aOwBRfHfmF408CCzTk21FLAhKrKVOP5Q5ebX+zCT4kvg81PGBGwrBiEGND1nWA==
|
||||
dependencies:
|
||||
"@embroider/addon-shim" "^1.8.3"
|
||||
ember-tracked-storage-polyfill "^1.0.0"
|
||||
|
||||
tracked-maps-and-sets@^3.0.1:
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/tracked-maps-and-sets/-/tracked-maps-and-sets-3.0.2.tgz#6ea1b9f2a367d24f2e9905b74b24437fbce76ea6"
|
||||
|
||||
Reference in new issue
Block a user