+
{{#each this.flashMessages.queue as |flash|}} diff --git a/app/templates/poll.hbs b/app/templates/poll.hbs index aa473b0..93d2614 100644 --- a/app/templates/poll.hbs +++ b/app/templates/poll.hbs @@ -1,46 +1,46 @@ {{#let @model as |poll|}} {{page-title poll.title}} -
-
-
-
-

{{poll.title}}

-

{{poll.description}}

-

- +

+
+
+
+

{{poll.title}}

+

{{poll.description}}

+

+ {{! TODO: Simplify to dateStyle="full" and timeStyle="short" after upgrading to Ember Intl v6 }} {{t - "poll.created-date" + 'poll.created-date' date=(format-date poll.creationDate - weekday="long" - day="numeric" - month="long" - year="numeric" - hour="numeric" - minute="numeric" + weekday='long' + day='numeric' + month='long' + year='numeric' + hour='numeric' + minute='numeric' ) }} {{#if poll.expirationDate}}
- + {{! TODO: Simplify to dateStyle="full" and timeStyle="short" after upgrading to Ember Intl v6 }} {{t - "poll.expiration-date" + 'poll.expiration-date' date=(format-date poll.expirationDate - weekday="long" - day="numeric" - month="long" - year="numeric" - hour="numeric" - minute="numeric" + weekday='long' + day='numeric' + month='long' + year='numeric' + hour='numeric' + minute='numeric' ) }} @@ -48,40 +48,40 @@

-
-
-

{{t "poll.share.title"}}

-

+

+
+

{{t 'poll.share.title'}}

+

- {{this.pollUrl}} + {{this.pollUrl}} - {{t "poll.link.copy-label"}}  + {{t 'poll.link.copy-label'}} 

- - {{t "poll.share.notice"}} + + {{t 'poll.share.notice'}}
{{#if this.showExpirationWarning}} -
-
- +
+
+ {{t - "poll.expiration-date-warning" + 'poll.expiration-date-warning' timeToNow=(format-date-relative poll.expirationDate) }} @@ -89,34 +89,39 @@
{{/if}} -
-
    +
    +
      + {{! template-lint-disable no-unknown-arguments-for-builtin-components }} + {{! + TODO: Refactor to current Bootstrap markup, which uses a regular + `` element within a `
    • `. + }} - - {{t "poll.tab-title.participation"}} + + {{t 'poll.tab-title.participation'}} - - {{t "poll.tab-title.evaluation"}} + + {{t 'poll.tab-title.evaluation'}}
    -
    -
    +
    +
    {{outlet}}
    @@ -125,32 +130,32 @@ {{/let}}

    - {{t "poll.modal.timezoneDiffers.body"}} + {{t 'poll.modal.timezoneDiffers.body'}}

    - {{t "poll.modal.timezoneDiffers.button.useLocalTimezone"}} + {{t 'poll.modal.timezoneDiffers.button.useLocalTimezone'}} - {{t "poll.modal.timezoneDiffers.button.usePollTimezone"}} - > + {{t 'poll.modal.timezoneDiffers.button.usePollTimezone'}} +     \ No newline at end of file diff --git a/app/utils/answers-for-answer-type.js b/app/utils/answers-for-answer-type.js index eb9fedc..e63ea4a 100644 --- a/app/utils/answers-for-answer-type.js +++ b/app/utils/answers-for-answer-type.js @@ -1,19 +1,19 @@ import { assert } from '@ember/debug'; -export default function(answerType) { +export default function (answerType) { switch (answerType) { case 'YesNo': return [ { type: 'yes', labelTranslation: 'answerTypes.yes.label', - icon: 'glyphicon glyphicon-thumbs-up' + icon: 'glyphicon glyphicon-thumbs-up', }, { type: 'no', labelTranslation: 'answerTypes.no.label', - icon: 'glyphicon glyphicon-thumbs-down' - } + icon: 'glyphicon glyphicon-thumbs-down', + }, ]; case 'YesNoMaybe': @@ -21,18 +21,18 @@ export default function(answerType) { { type: 'yes', labelTranslation: 'answerTypes.yes.label', - icon: 'glyphicon glyphicon-thumbs-up' + icon: 'glyphicon glyphicon-thumbs-up', }, { type: 'maybe', labelTranslation: 'answerTypes.maybe.label', - icon: 'glyphicon glyphicon-hand-right' + icon: 'glyphicon glyphicon-hand-right', }, { type: 'no', labelTranslation: 'answerTypes.no.label', - icon: 'glyphicon glyphicon-thumbs-down' - } + icon: 'glyphicon glyphicon-thumbs-down', + }, ]; case 'FreeText': diff --git a/app/utils/generate-passphrase.js b/app/utils/generate-passphrase.js index 9d3e1c0..c8f103b 100644 --- a/app/utils/generate-passphrase.js +++ b/app/utils/generate-passphrase.js @@ -7,9 +7,10 @@ * implementation by Aaron Toponce: * https://pthree.org/2014/06/25/cryptographically-secure-passphrases-in-d-note/ */ -export default function(length) { +export default function (length) { let passphrase = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + const possible = + 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const randomArray = new Uint32Array(length); // Make some attempt at preferring a strong CSPRNG first @@ -22,12 +23,12 @@ export default function(length) { window.msCrypto.getRandomValues(randomArray); } else { // Android browser, IE Mobile, Opera Mobile, older desktop browsers - for (let i = length; i--;) { + for (let i = length; i--; ) { randomArray[i] = Math.floor(Math.random() * Math.pow(2, 32)); } } - for (let j = length; j--;) { + for (let j = length; j--; ) { passphrase += possible.charAt(Math.floor(randomArray[j] % possible.length)); } diff --git a/config/bundlesize.js b/config/bundlesize.js index c437578..198ee5e 100644 --- a/config/bundlesize.js +++ b/config/bundlesize.js @@ -5,12 +5,12 @@ module.exports = { javascript: { pattern: 'assets/*.js', limit: '430KB', - compression: 'gzip' + compression: 'gzip', }, css: { pattern: 'assets/*.css', limit: '16KB', - compression: 'gzip' - } - } + compression: 'gzip', + }, + }, }; diff --git a/config/content-security-policy.js b/config/content-security-policy.js index 12e35a3..588ea4a 100644 --- a/config/content-security-policy.js +++ b/config/content-security-policy.js @@ -8,7 +8,7 @@ module.exports = function () { 'script-src': ["'self'"], 'font-src': ["'self'"], 'connect-src': ["'self'"], - 'img-src': ["'self'", "data:"], + 'img-src': ["'self'", 'data:'], 'style-src': ["'self'"], 'media-src': ["'none'"], }, diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js index a5fe827..70e72c3 100644 --- a/config/deprecation-workflow.js +++ b/config/deprecation-workflow.js @@ -2,8 +2,8 @@ self.deprecationWorkflow = self.deprecationWorkflow || {}; self.deprecationWorkflow.config = { workflow: [ - { handler: "silence", matchId: "ember-cli-page-object.old-collection-api" }, - { handler: "silence", matchId: "deprecate-fetch-ember-data-support" }, - { handler: "silence", matchId: "ember-runtime.deprecate-copy-copyable" } - ] + { handler: 'silence', matchId: 'ember-cli-page-object.old-collection-api' }, + { handler: 'silence', matchId: 'deprecate-fetch-ember-data-support' }, + { handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' }, + ], }; diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 3bcf33b..ca06f88 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.20.2", + "version": "3.28.6", "blueprints": [ { "name": "app", diff --git a/config/ember-intl.js b/config/ember-intl.js index 8df22a4..3e154ee 100644 --- a/config/ember-intl.js +++ b/config/ember-intl.js @@ -1,6 +1,6 @@ /*jshint node:true*/ -module.exports = function(/* environment */) { +module.exports = function (/* environment */) { return { /** * The locales that the application needs to support. @@ -27,7 +27,7 @@ module.exports = function(/* environment */) { * @type {String?} * @default "null" */ - fallbackLocale: "en", + fallbackLocale: 'en', /** * Path where translations are kept. This is relative to the project root. @@ -120,6 +120,6 @@ module.exports = function(/* environment */) { */ requiresTranslation(/* key, locale */) { return true; - } + }, }; }; diff --git a/config/environment.js b/config/environment.js index d3ce6ed..7d243c0 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,6 +1,6 @@ 'use strict'; -module.exports = function(environment) { +module.exports = function (environment) { let ENV = { modulePrefix: 'croodle', environment, @@ -15,8 +15,8 @@ module.exports = function(environment) { Array: true, Date: false, String: false, - Function: true - } + Function: true, + }, }, APP: { diff --git a/config/targets.js b/config/targets.js index e37d87d..8a2085c 100644 --- a/config/targets.js +++ b/config/targets.js @@ -2,15 +2,11 @@ const browsers = [ 'last 2 Chrome versions', - // Last Edge versions are based on Chrome but not shipped to a significant - // number of users. Change to `last 2 Edge versions` as soon as Chrome-based - // Edge is shipped to all users. - 'Edge >= 18', 'last 2 Firefox versions', 'Firefox ESR', 'last 2 Safari versions', ]; module.exports = { - browsers + browsers, }; diff --git a/ember-cli-build.js b/ember-cli-build.js index b483198..146f9d3 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -2,7 +2,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); -module.exports = function(defaults) { +module.exports = function (defaults) { let app = new EmberApp(defaults, { autoImport: { forbidEval: true, @@ -11,21 +11,27 @@ module.exports = function(defaults) { // sjcl requires node's cryto library, which isn't needed // in Browser but causes webpack to bundle a portable version // which increases the build size by an inacceptable amount - crypto: "null", + crypto: 'null', }, }, }, - 'buildInfoOptions': { - 'metaTemplate': 'version={SEMVER}' + buildInfoOptions: { + metaTemplate: 'version={SEMVER}', }, 'ember-bootstrap': { importBootstrapCSS: false, - 'bootstrapVersion': 4, - 'importBootstrapFont': false, - whitelist: ['bs-alert', 'bs-button', 'bs-button-group', 'bs-form', 'bs-modal'], + bootstrapVersion: 4, + importBootstrapFont: false, + whitelist: [ + 'bs-alert', + 'bs-button', + 'bs-button-group', + 'bs-form', + 'bs-modal', + ], }, 'ember-cli-babel': { - includePolyfill: true + includePolyfill: true, }, 'ember-composable-helpers': { only: ['array', 'object-at', 'pick'], @@ -36,7 +42,7 @@ module.exports = function(defaults) { autoprefixer: { browsers: ['last 2 ios version'], cascade: false, - sourcemap: true + sourcemap: true, }, sassOptions: { sourceMapEmbed: true, diff --git a/lib/.eslintrc.js b/lib/.eslintrc.js index 104718c..548ea34 100644 --- a/lib/.eslintrc.js +++ b/lib/.eslintrc.js @@ -1,6 +1,6 @@ module.exports = { env: { node: true, - browser: false - } + browser: false, + }, }; diff --git a/lib/include-api-in-build/index.js b/lib/include-api-in-build/index.js index 54f718f..1a48e5a 100644 --- a/lib/include-api-in-build/index.js +++ b/lib/include-api-in-build/index.js @@ -41,15 +41,19 @@ module.exports = { }) .then(() => { return new Promise((resolve, reject) => { - exec('composer install --no-dev', { - cwd: outputPath - }, (err) => { - if (err) { - reject(err); - } + exec( + 'composer install --no-dev', + { + cwd: outputPath, + }, + (err) => { + if (err) { + reject(err); + } - resolve(); - }); + resolve(); + } + ); }); }) .then(() => { @@ -58,5 +62,5 @@ module.exports = { unlink(`${outputPath}/composer.lock`), ]); }); - } + }, }; diff --git a/mirage/config.js b/mirage/config.js index 05681de..cd4fa3a 100644 --- a/mirage/config.js +++ b/mirage/config.js @@ -1,6 +1,6 @@ -export default function() { - this.namespace = '/api/index.php'; // make this `api`, for example, if your API is namespaced - this.timing = 400; // delay for each request, automatically set to 0 during testing +export default function () { + this.namespace = '/api/index.php'; // make this `api`, for example, if your API is namespaced + this.timing = 400; // delay for each request, automatically set to 0 during testing this.get('/polls/:id'); this.post('/polls'); diff --git a/mirage/factories/poll.js b/mirage/factories/poll.js index 2d85dfb..f2a3889 100644 --- a/mirage/factories/poll.js +++ b/mirage/factories/poll.js @@ -9,14 +9,14 @@ export default Factory.extend({ type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Ja' + label: 'Ja', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'Nein' - } + label: 'Nein', + }, ], answerType: 'YesNo', creationDate: '2015-04-01T11:11:11.111Z', @@ -27,11 +27,11 @@ export default Factory.extend({ isDateTime: false, options: [ { - title: '2017-12-24' + title: '2017-12-24', }, { - title: '2018-01-01' - } + title: '2018-01-01', + }, ], pollType: 'FindADate', title: 'default title', @@ -50,8 +50,8 @@ export default Factory.extend({ 'options', 'pollType', 'timezone', - 'title' + 'title', ]; encrypt(propertiesToEncrypt, poll, server); - } + }, }); diff --git a/mirage/factories/user.js b/mirage/factories/user.js index 6ad0dc5..5482873 100644 --- a/mirage/factories/user.js +++ b/mirage/factories/user.js @@ -3,15 +3,11 @@ import { Factory } from 'ember-cli-mirage'; import encrypt from '../utils/encrypt'; export default Factory.extend({ - creationDate: (new Date()).toISOString(), + creationDate: new Date().toISOString(), name: 'John Doe', selections: [], afterCreate(user, server) { - let propertiesToEncrypt = [ - 'creationDate', - 'name', - 'selections' - ]; + let propertiesToEncrypt = ['creationDate', 'name', 'selections']; encrypt(propertiesToEncrypt, user, server); - } + }, }); diff --git a/mirage/identity-managers/poll.js b/mirage/identity-managers/poll.js index 8b0143c..89e5e07 100644 --- a/mirage/identity-managers/poll.js +++ b/mirage/identity-managers/poll.js @@ -51,6 +51,6 @@ export default class { * @public */ reset() { - this._ids = {}; + this._ids = {}; } } diff --git a/mirage/models/poll.js b/mirage/models/poll.js index 41d362e..99a5087 100644 --- a/mirage/models/poll.js +++ b/mirage/models/poll.js @@ -1,5 +1,5 @@ import { Model, hasMany } from 'ember-cli-mirage'; export default Model.extend({ - users: hasMany('user') + users: hasMany('user'), }); diff --git a/mirage/models/user.js b/mirage/models/user.js index fe42ae7..16f87cf 100644 --- a/mirage/models/user.js +++ b/mirage/models/user.js @@ -1,5 +1,5 @@ import { Model, belongsTo } from 'ember-cli-mirage'; export default Model.extend({ - poll: belongsTo('poll') + poll: belongsTo('poll'), }); diff --git a/mirage/scenarios/default.js b/mirage/scenarios/default.js index 0d2db8d..9ef5b22 100644 --- a/mirage/scenarios/default.js +++ b/mirage/scenarios/default.js @@ -1,11 +1,9 @@ -export default function(/* server */) { - +export default function (/* server */) { /* Seed your development database using your factories. This data will not be loaded in your tests. Make sure to define a factory for each model you want to create. */ - // server.createList('post', 10); } diff --git a/mirage/serializers/application.js b/mirage/serializers/application.js index 37f63f7..d45b74c 100644 --- a/mirage/serializers/application.js +++ b/mirage/serializers/application.js @@ -11,12 +11,13 @@ export default RestSerializer.extend({ normalize(payload) { let [type] = Object.keys(payload); let attrs = payload[type]; - let { belongsToAssociations, hasManyAssociations } = this.registry.schema._registry[type].class.prototype; + let { belongsToAssociations, hasManyAssociations } = + this.registry.schema._registry[type].class.prototype; let jsonApiPayload = { data: { - type: pluralize(type) - } + type: pluralize(type), + }, }; Object.keys(attrs).forEach((key) => { @@ -32,8 +33,12 @@ export default RestSerializer.extend({ jsonApiPayload.data.relationships = {}; } - let association = belongsToAssociations.hasOwnProperty(key) ? belongsToAssociations[key] : hasManyAssociations[key]; - let associationType = belongsToAssociations.hasOwnProperty(key) ? 'belongsTo' : 'hasMany'; + let association = belongsToAssociations.hasOwnProperty(key) + ? belongsToAssociations[key] + : hasManyAssociations[key]; + let associationType = belongsToAssociations.hasOwnProperty(key) + ? 'belongsTo' + : 'hasMany'; let associationModel = association.modelName; let relationshipObject = {}; @@ -41,7 +46,7 @@ export default RestSerializer.extend({ case 'belongsTo': relationshipObject.data = { type: associationModel, - id: attrs[key] + id: attrs[key], }; break; case 'hasMany': @@ -49,7 +54,7 @@ export default RestSerializer.extend({ attrs[key].forEach((value) => { relationshipObject.data.push({ type: associationModel, - id: value + id: value, }); }); break; @@ -68,5 +73,5 @@ export default RestSerializer.extend({ return jsonApiPayload; }, - serializeIds: 'always' + serializeIds: 'always', }); diff --git a/mirage/serializers/poll.js b/mirage/serializers/poll.js index 39b8928..02753c2 100644 --- a/mirage/serializers/poll.js +++ b/mirage/serializers/poll.js @@ -3,5 +3,5 @@ import ApplicationSerializer from './application'; export default ApplicationSerializer.extend({ embed: true, - include: ['users'] + include: ['users'], }); diff --git a/mirage/utils/encrypt.js b/mirage/utils/encrypt.js index a17587f..f4bddfb 100644 --- a/mirage/utils/encrypt.js +++ b/mirage/utils/encrypt.js @@ -9,19 +9,20 @@ import { isArray } from '@ember/array'; import { get } from '@ember/object'; import sjcl from 'sjcl'; -export default function(propertiesToEncrypt, model) { +export default function (propertiesToEncrypt, model) { assert('first argument must be an array', isArray(propertiesToEncrypt)); - assert('model must have an encryptionKey property which isn\'t empty', isPresent(get(model, 'encryptionKey'))); + assert( + "model must have an encryptionKey property which isn't empty", + isPresent(model.encryptionKey) + ); - let passphrase = get(model, 'encryptionKey'); + let passphrase = model.encryptionKey; let data = { - encryptionKey: undefined + encryptionKey: undefined, }; propertiesToEncrypt.forEach((propertyToEncrypt) => { - let value = JSON.stringify( - get(model, propertyToEncrypt) - ); + let value = JSON.stringify(get(model, propertyToEncrypt)); data[propertyToEncrypt] = sjcl.encrypt(passphrase, value); }); diff --git a/package.json b/package.json index 79e038f..eeba93e 100644 --- a/package.json +++ b/package.json @@ -11,20 +11,24 @@ }, "scripts": { "build": "ember build --environment=production", - "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*", + "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:hbs": "ember-template-lint .", - "lint:js": "eslint .", + "lint:hbs:fix": "ember-template-lint . --fix", + "lint:js": "eslint . --cache", "release": "release-it", + "lint:js:fix": "eslint . --fix", "start": "ember serve", - "test": "npm-run-all lint:* test:*", + "test": "npm-run-all lint test:*", "test:ember": "ember test", "test:bundlesize": "ember bundlesize:test", "test:csp-header": "grep \"`ember csp-headers --environment production --silent 2>&1 | sed 's/ $//'`\" public/.htaccess || (echo \"CSP headers in public/.htaccess does not match configuration\" && exit 1)" }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@glimmer/component": "^1.0.1", - "@glimmer/tracking": "^1.0.0", + "@ember/test-helpers": "^2.6.0", + "@glimmer/component": "^1.0.4", + "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "bootstrap": "^4.3.1", "broccoli-asset-rev": "^3.0.0", @@ -32,10 +36,10 @@ "ember-awesome-macros": "^6.0.0", "ember-bootstrap": "^5.0.0", "ember-classic-decorator": "^3.0.0", - "ember-cli": "~3.28.0", + "ember-cli": "~3.28.6", "ember-cli-acceptance-test-helpers": "^1.0.0", "ember-cli-app-version": "^6.0.0", - "ember-cli-babel": "^7.21.0", + "ember-cli-babel": "^7.26.10", "ember-cli-browser-navigation-button-test-helper": "^0.3.0", "ember-cli-browserstack": "^2.0.0", "ember-cli-bundlesize": "^0.3.0", @@ -44,43 +48,48 @@ "ember-cli-dependency-checker": "^3.2.0", "ember-cli-deprecation-workflow": "^2.0.0", "ember-cli-flash": "^2.0.0", - "ember-cli-htmlbars": "^5.2.0", - "ember-cli-inject-live-reload": "^2.0.2", + "ember-cli-htmlbars": "^5.7.2", + "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-mirage": "^2.0.0", "ember-cli-page-object": "^1.11.0", "ember-cli-sass": "^10.0.0", "ember-cli-sri": "^2.1.1", - "ember-cli-uglify": "^3.0.0", + "ember-cli-terser": "^4.0.2", "ember-composable-helpers": "^4.0.0", - "ember-data": "~3.28.0", + "ember-data": "~3.28.6", "ember-data-model-fragments": "^6.0.0", "ember-decorators": "^6.1.1", "ember-export-application-global": "^2.0.1", - "ember-fetch": "^8.0.1", + "ember-fetch": "^8.1.1", "ember-intl": "^4.2.2", - "ember-load-initializers": "^2.1.1", + "ember-load-initializers": "^2.1.2", "ember-math-helpers": "^2.8.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-modifier": "^3.2.7", - "ember-page-title": "^6.0.0", + "ember-page-title": "^6.2.2", "ember-power-calendar": "^0.20.0", "ember-power-calendar-luxon": "^0.5.0", - "ember-qunit": "^4.6.0", - "ember-resolver": "^8.0.0", - "ember-source": "~3.28.0", - "ember-template-lint": "^2.9.1", + "ember-qunit": "^5.1.5", + "ember-resolver": "^8.0.3", + "ember-source": "~3.28.8", + "ember-template-lint": "^3.15.0", "ember-test-selectors": "^5.0.0", "ember-transition-helper": "^1.0.0", "ember-truth-helpers": "^3.0.0", - "eslint": "^7.5.0", - "eslint-plugin-ember": "^8.9.1", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.5.8", "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-qunit": "^6.2.0", "fs-extra": "^9.0.0", "lerna-changelog": "^1.0.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "open-iconic": "^1.1.1", - "qunit-dom": "^1.2.0", + "prettier": "^2.5.1", + "qunit": "^2.17.2", + "qunit-dom": "^1.6.0", "release-it": "^16.0.0", "release-it-lerna-changelog": "^5.0.0", "sass": "^1.19.0", diff --git a/public/assets/internet-explorer-11-deprecation.js b/public/assets/internet-explorer-11-deprecation.js index 75964e8..0f4fcca 100644 --- a/public/assets/internet-explorer-11-deprecation.js +++ b/public/assets/internet-explorer-11-deprecation.js @@ -15,9 +15,7 @@ header.style.color = '#B33A3A'; var icon = document.createElement('span'); icon.className = 'oi oi-warning'; header.appendChild(icon); -header.appendChild( - document.createTextNode('Your Browser is not supported!') -); +header.appendChild(document.createTextNode('Your Browser is not supported!')); header.appendChild(icon.cloneNode()); container.appendChild(header); diff --git a/testem.browserstack.js b/testem.browserstack.js index 5c1f20c..069a4e7 100644 --- a/testem.browserstack.js +++ b/testem.browserstack.js @@ -6,14 +6,9 @@ module.exports = { timeout: 1200, browser_start_timeout: 2000, browser_disconnect_timeout: 300, - launch_in_ci: [ - 'BS_MS_Edge', - 'BS_Safari_Current', - ], + launch_in_ci: ['BS_MS_Edge', 'BS_Safari_Current'], - 'launch_in_dev': [ - 'Chrome' - ], + launch_in_dev: ['Chrome'], launchers: { BS_Chrome_Current: { @@ -106,5 +101,5 @@ module.exports = { ], protocol: 'browser', }, - } + }, }; diff --git a/testem.js b/testem.js index 9c6fc15..341aeb0 100644 --- a/testem.js +++ b/testem.js @@ -3,13 +3,8 @@ module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - launch_in_ci: [ - 'Chrome', - 'Firefox', - ], - launch_in_dev: [ - 'Chrome' - ], + launch_in_ci: ['Chrome'], + launch_in_dev: ['Chrome'], browser_start_timeout: 120, browser_args: { Chrome: { @@ -21,23 +16,18 @@ module.exports = { '--disable-software-rasterizer', '--mute-audio', '--remote-debugging-port=0', - '--window-size=1440,900' - ].filter(Boolean) + '--window-size=1440,900', + ].filter(Boolean), }, Firefox: { - ci: [ - '--headless', - '--window-size=1440,900', - ] + ci: ['--headless', '--window-size=1440,900'], }, }, proxies: { '/': { target: 'http://localhost:4200', - onlyContentTypes: [ - 'json' - ] - } + onlyContentTypes: ['json'], + }, }, launchers: { SL_chrome: { @@ -54,7 +44,7 @@ module.exports = { '--no-ct', '--u', ], - protocol: 'browser' + protocol: 'browser', }, SL_firefox: { exe: 'ember', @@ -70,7 +60,7 @@ module.exports = { '--no-ct', '--u', ], - protocol: 'browser' + protocol: 'browser', }, SL_edge: { exe: 'ember', @@ -84,7 +74,7 @@ module.exports = { '--no-ct', '--u', ], - protocol: 'browser' + protocol: 'browser', }, SL_ie: { exe: 'ember', @@ -102,7 +92,7 @@ module.exports = { '--no-ct', '--u', ], - protocol: 'browser' + protocol: 'browser', }, SL_safari: { exe: 'ember', @@ -118,7 +108,7 @@ module.exports = { '--no-ct', '--u', ], - protocol: 'browser' - } - } + protocol: 'browser', + }, + }, }; diff --git a/tests/acceptance/build-test.js b/tests/acceptance/build-test.js index 3d93818..c7a31ca 100644 --- a/tests/acceptance/build-test.js +++ b/tests/acceptance/build-test.js @@ -2,15 +2,17 @@ import { visit } from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; -module('Acceptance | build', function(hooks) { +module('Acceptance | build', function (hooks) { setupApplicationTest(hooks); - test('version is included as html meta tag', async function(assert) { + test('version is included as html meta tag', async function (assert) { await visit('/'); // head is not available through `find()`, `assert.dom()` or `this.element.querySelector()` // cause they are scoped to `#ember-testing-container`. - let buildInfoEl = document.head.querySelector('head meta[name="build-info"]'); + let buildInfoEl = document.head.querySelector( + 'head meta[name="build-info"]' + ); assert.ok(buildInfoEl, 'tag exists'); let content = buildInfoEl.content; @@ -20,18 +22,23 @@ module('Acceptance | build', function(hooks) { ); }); - test('CSP meta tag is present and before any dangerous element', async function(assert) { + test('CSP meta tag is present and before any dangerous element', async function (assert) { await visit('/'); // `find()`, `assert.dom()` and `this.element.querySelector()` are all scoped to `#testing-container` // and therefore don't have access to head - assert.ok(document.head.querySelector('meta[http-equiv="Content-Security-Policy"]'), 'CSP meta tag exists'); + assert.ok( + document.head.querySelector('meta[http-equiv="Content-Security-Policy"]'), + 'CSP meta tag exists' + ); // this only covers dynamically created elements not the ones defined in `app/index.html` cause // that one is replaced by `tests/index.html` for testing. ['link', 'script', 'style'].forEach((type) => { assert.notOk( - document.head.querySelector(`${type} meta[http-equiv="Content-Security-Policy"]`), + document.head.querySelector( + `${type} meta[http-equiv="Content-Security-Policy"]` + ), 'CSP meta tag does not have a silbing of type ${type}' ); }); diff --git a/tests/acceptance/create-a-poll-test.js b/tests/acceptance/create-a-poll-test.js index 62cca0a..6b00380 100644 --- a/tests/acceptance/create-a-poll-test.js +++ b/tests/acceptance/create-a-poll-test.js @@ -1,9 +1,21 @@ -import { click, currentURL, currentRouteName, fillIn, findAll, settled, visit, waitFor } from '@ember/test-helpers'; +import { + click, + currentURL, + currentRouteName, + fillIn, + findAll, + settled, + visit, + waitFor, +} from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; import { setupMirage } from 'ember-cli-mirage/test-support'; import { setupIntl, t } from 'ember-intl/test-support'; -import { setupBrowserNavigationButtons, backButton } from 'ember-cli-browser-navigation-button-test-helper/test-support'; +import { + setupBrowserNavigationButtons, + backButton, +} from 'ember-cli-browser-navigation-button-test-helper/test-support'; import { DateTime } from 'luxon'; import pageCreateIndex from 'croodle/tests/pages/create/index'; import pageCreateMeta from 'croodle/tests/pages/create/meta'; @@ -14,8 +26,8 @@ import pagePollParticipation from 'croodle/tests/pages/poll/participation'; import asyncThrowsAssertion from '../assertions/async-throws'; import { calendarSelect } from 'ember-power-calendar/test-support'; -module('Acceptance | create a poll', function(hooks) { - hooks.beforeEach(function() { +module('Acceptance | create a poll', function (hooks) { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'en'); }); @@ -23,11 +35,11 @@ module('Acceptance | create a poll', function(hooks) { setupMirage(hooks); setupIntl(hooks); - hooks.beforeEach(function(assert) { + hooks.beforeEach(function (assert) { assert.asyncThrows = asyncThrowsAssertion; }); - test('create a default poll', async function(assert) { + test('create a default poll', async function (assert) { const dates = [ DateTime.now().plus({ days: 1 }), DateTime.now().plus({ weeks: 1 }), @@ -41,18 +53,24 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (index)' ); assert.deepEqual( - pageCreateIndex.statusBar().toArray().map((el) => el.text), + pageCreateIndex + .statusBar() + .toArray() + .map((el) => el.text), [ t('create.formStep.type').toString(), t('create.formStep.meta').toString(), t('create.formStep.options.days').toString(), t('create.formStep.options-datetime').toString(), - t('create.formStep.settings').toString() + t('create.formStep.settings').toString(), ], 'status bar has correct items' ); assert.deepEqual( - pageCreateIndex.statusBar().toArray().map((el) => el.isDisabled), + pageCreateIndex + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, true, true, true, true], 'status bar has correct items disabled (index)' ); @@ -69,18 +87,16 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (meta)' ); assert.deepEqual( - pageCreateMeta.statusBar().toArray().map((el) => el.isDisabled), + pageCreateMeta + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, true, true, true], 'status bar has correct items disabled (meta)' ); - assert.ok( - pageCreateMeta.titleHasFocus, - 'title input has autofocus' - ); + assert.ok(pageCreateMeta.titleHasFocus, 'title input has autofocus'); - await pageCreateMeta - .title('default poll') - .next(); + await pageCreateMeta.title('default poll').next(); assert.equal(currentRouteName(), 'create.options'); assert.equal( pageCreateOptions.statusBar().active, @@ -88,7 +104,10 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (options.days)' ); assert.deepEqual( - pageCreateOptions.statusBar().toArray().map((el) => el.isDisabled), + pageCreateOptions + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, false, true, true], 'status bar has correct items disabled (options)' ); @@ -102,7 +121,10 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (options-datetime)' ); assert.deepEqual( - pageCreateOptionsDatetime.statusBar().toArray().map((el) => el.isDisabled), + pageCreateOptionsDatetime + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, false, false, true], 'status bar has correct items disabled (options-datetime)' ); @@ -119,7 +141,10 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (settings)' ); assert.deepEqual( - pageCreateSettings.statusBar().toArray().map((el) => el.isDisabled), + pageCreateSettings + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, false, false, false], 'status bar has correct items disabled (settings)' ); @@ -140,7 +165,7 @@ module('Acceptance | create a poll', function(hooks) { // defer creation for testing loading spinner let resolveSubmission; let resolveSubmissionWith; - this.server.post('/polls', function(schema) { + this.server.post('/polls', function (schema) { return new Promise((resolve) => { let attrs = this.normalizedRequestAttrs(); @@ -161,8 +186,8 @@ module('Acceptance | create a poll', function(hooks) { await settled(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, + assert.true( + pagePollParticipation.urlIsValid(), `poll url ${currentURL()} is valid` ); assert.equal( @@ -177,24 +202,23 @@ module('Acceptance | create a poll', function(hooks) { ); assert.deepEqual( pagePollParticipation.options().labels, - dates.map((date) => Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(date)), + dates.map((date) => + Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(date) + ), 'options are correctly labeled' ); assert.deepEqual( pagePollParticipation.options().answers, [ t('answerTypes.yes.label').toString(), - t('answerTypes.no.label').toString() + t('answerTypes.no.label').toString(), ], 'answers are correctly labeled' ); - assert.ok( - pagePollParticipation.nameHasFocus, - 'name input has autofocus' - ); + assert.ok(pagePollParticipation.nameHasFocus, 'name input has autofocus'); }); - test('create a poll for answering a question', async function(assert) { + test('create a poll for answering a question', async function (assert) { await pageCreateIndex.visit(); assert.equal( pageCreateIndex.statusBar().active, @@ -202,14 +226,15 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (index)' ); assert.deepEqual( - pageCreateIndex.statusBar().toArray().map((el) => el.isDisabled), + pageCreateIndex + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, true, true, true, true], 'status bar has correct items disabled' ); - await pageCreateIndex - .pollType('MakeAPoll') - .next(); + await pageCreateIndex.pollType('MakeAPoll').next(); assert.equal(currentRouteName(), 'create.meta'); assert.equal( pageCreateMeta.statusBar().active, @@ -217,24 +242,28 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (meta)' ); assert.deepEqual( - pageCreateMeta.statusBar().toArray().map((el) => el.text), + pageCreateMeta + .statusBar() + .toArray() + .map((el) => el.text), [ t('create.formStep.type').toString(), t('create.formStep.meta').toString(), t('create.formStep.options.text').toString(), - t('create.formStep.settings').toString() + t('create.formStep.settings').toString(), ], 'status bar has correct items' ); assert.deepEqual( - pageCreateMeta.statusBar().toArray().map((el) => el.isDisabled), + pageCreateMeta + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, true, true], 'status bar has correct items disabled (meta)' ); - await pageCreateMeta - .title('default poll') - .next(); + await pageCreateMeta.title('default poll').next(); assert.equal(currentRouteName(), 'create.options'); assert.equal( pageCreateOptions.statusBar().active, @@ -242,7 +271,10 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (options.text)' ); assert.deepEqual( - pageCreateOptions.statusBar().toArray().map((el) => el.isDisabled), + pageCreateOptions + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, false, true], 'status bar has correct items disabled (options)' ); @@ -269,26 +301,18 @@ module('Acceptance | create a poll', function(hooks) { ); assert.ok( pageCreateOptions.textOptions(0).hasError && - pageCreateOptions.textOptions(1).hasError, + pageCreateOptions.textOptions(1).hasError, 'validation errors are shown after submit' ); await pageCreateOptions.textOptions(0).title('option a'); await pageCreateOptions.textOptions(1).title('option c'); await pageCreateOptions.textOptions(0).add(); - assert.equal( - pageCreateOptions.textOptions().count, - 3, - 'option was added' - ); + assert.equal(pageCreateOptions.textOptions().count, 3, 'option was added'); await pageCreateOptions.textOptions(1).title('option b'); await pageCreateOptions.textOptions(2).add(); - assert.equal( - pageCreateOptions.textOptions().count, - 4, - 'option was added' - ); + assert.equal(pageCreateOptions.textOptions().count, 4, 'option was added'); await pageCreateOptions.textOptions(3).title('to be deleted'); await pageCreateOptions.textOptions(3).delete(); @@ -306,17 +330,17 @@ module('Acceptance | create a poll', function(hooks) { 'status bar shows correct item as current path (settings)' ); assert.deepEqual( - pageCreateSettings.statusBar().toArray().map((el) => el.isDisabled), + pageCreateSettings + .statusBar() + .toArray() + .map((el) => el.isDisabled), [false, false, false, false], 'status bar has correct items disabled (settings)' ); await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -334,7 +358,7 @@ module('Acceptance | create a poll', function(hooks) { ); }); - test('create a poll with times and description', async function(assert) { + test('create a poll with times and description', async function (assert) { const days = [ DateTime.now().plus({ days: 1 }), DateTime.now().plus({ weeks: 1 }), @@ -355,7 +379,9 @@ module('Acceptance | create a poll', function(hooks) { assert.equal(currentRouteName(), 'create.options-datetime'); assert.deepEqual( pageCreateOptionsDatetime.days().labels, - days.map((day) => Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day)), + days.map((day) => + Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day) + ), 'time inputs having days as label' ); @@ -368,10 +394,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -385,15 +408,23 @@ module('Acceptance | create a poll', function(hooks) { assert.deepEqual( pagePollParticipation.options().labels, [ - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(days[0].set({ hour: 10, minutes: 0 })), - Intl.DateTimeFormat('en-US', { timeStyle: "short" }).format(days[0].set({ hours: 18, minutes: 0 })), - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(days[1].set({ hour: 12, minutes: 0 })), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(days[0].set({ hour: 10, minutes: 0 })), + Intl.DateTimeFormat('en-US', { timeStyle: 'short' }).format( + days[0].set({ hours: 18, minutes: 0 }) + ), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(days[1].set({ hour: 12, minutes: 0 })), ], 'options are correctly labeled' ); }); - test('create a poll with only one day and multiple times', async function(assert) { + test('create a poll with only one day and multiple times', async function (assert) { const day = DateTime.now().plus({ days: 1 }); await pageCreateIndex.visit(); @@ -406,17 +437,17 @@ module('Acceptance | create a poll', function(hooks) { .next(); assert.equal(currentRouteName(), 'create.options'); - await pageCreateOptions.selectDates([ day ]); + await pageCreateOptions.selectDates([day]); await pageCreateOptions.next(); assert.equal(currentRouteName(), 'create.options-datetime'); assert.deepEqual( pageCreateOptionsDatetime.days().labels, - [ Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day) ], + [Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day)], 'time inputs having days as label' ); assert .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) - .exists({ count: 1 }, 'shows one input field per day as default') + .exists({ count: 1 }, 'shows one input field per day as default'); assert .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) .hasValue('', 'time input field is empty until user enters a time'); @@ -429,7 +460,10 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateOptionsDatetime.times(0).delete(); assert .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) - .hasValue('', 'deleting clears time input value if there is only one time'); + .hasValue( + '', + 'deleting clears time input value if there is only one time' + ); await pageCreateOptionsDatetime.times(0).time('10:00'); await pageCreateOptionsDatetime.times(0).add(); @@ -437,10 +471,14 @@ module('Acceptance | create a poll', function(hooks) { .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) .exists({ count: 2 }, 'user can add a second input field'); assert - .dom(findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[1]) + .dom( + findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[1] + ) .hasValue('', 'newly crated second input field is empty'); assert - .dom(findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[0]) + .dom( + findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[0] + ) .hasValue('10:00', 'value existing input field is not changed'); await pageCreateOptionsDatetime.times(1).time('14:00'); @@ -455,8 +493,9 @@ module('Acceptance | create a poll', function(hooks) { .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) .exists({ count: 2 }, 'user can delete an input field'); assert.deepEqual( - findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`) - .map((el) => el.value), + findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`).map( + (el) => el.value + ), ['10:00', '18:00'], 'correct input field is deleted' ); @@ -466,10 +505,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -483,14 +519,19 @@ module('Acceptance | create a poll', function(hooks) { assert.deepEqual( pagePollParticipation.options().labels, [ - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(day.set({ hours: 10, minutes: 0 })), - Intl.DateTimeFormat('en-US', { timeStyle: "short" }).format(day.set({ hours: 18, minutes: 0 })), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(day.set({ hours: 10, minutes: 0 })), + Intl.DateTimeFormat('en-US', { timeStyle: 'short' }).format( + day.set({ hours: 18, minutes: 0 }) + ), ], 'options are correctly labeled' ); }); - test('create a poll with only one day (without time)', async function(assert) { + test('create a poll with only one day (without time)', async function (assert) { const day = DateTime.now().plus({ days: 1 }); await pageCreateIndex.visit(); @@ -503,12 +544,12 @@ module('Acceptance | create a poll', function(hooks) { .next(); assert.equal(currentRouteName(), 'create.options'); - await pageCreateOptions.selectDates([ day ]); + await pageCreateOptions.selectDates([day]); await pageCreateOptions.next(); assert.equal(currentRouteName(), 'create.options-datetime'); assert.deepEqual( pageCreateOptionsDatetime.days().labels, - [ Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day) ], + [Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day)], 'time inputs having days as label' ); @@ -517,10 +558,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -533,14 +571,12 @@ module('Acceptance | create a poll', function(hooks) { ); assert.deepEqual( pagePollParticipation.options().labels, - [ - Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day) - ], + [Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day)], 'options are correctly labeled' ); }); - test('create a poll with only one day (with time)', async function(assert) { + test('create a poll with only one day (with time)', async function (assert) { const day = DateTime.now().plus({ days: 1 }); await pageCreateIndex.visit(); @@ -553,12 +589,12 @@ module('Acceptance | create a poll', function(hooks) { .next(); assert.equal(currentRouteName(), 'create.options'); - await pageCreateOptions.selectDates([ day ]); + await pageCreateOptions.selectDates([day]); await pageCreateOptions.next(); assert.equal(currentRouteName(), 'create.options-datetime'); assert.deepEqual( pageCreateOptionsDatetime.days().labels, - [ Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day) ], + [Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day)], 'time inputs having days as label' ); @@ -568,10 +604,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -585,32 +618,35 @@ module('Acceptance | create a poll', function(hooks) { assert.deepEqual( pagePollParticipation.options().labels, [ - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(day.set({ hours: 22, minutes: 30 })), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(day.set({ hours: 22, minutes: 30 })), ], 'options are correctly labeled' ); }); - test("create a poll with times by adopting times of first day", async function (assert) { + test('create a poll with times by adopting times of first day', async function (assert) { const days = [ DateTime.now().plus({ days: 1 }), DateTime.now().plus({ weeks: 1 }), ]; - await visit("/create"); + await visit('/create'); await click('button[type="submit"]'); - assert.equal(currentRouteName(), "create.meta"); + assert.equal(currentRouteName(), 'create.meta'); await fillIn( '[data-test-form-element="title"] input[type="text"]', - "example poll for to test time adopting workflow" + 'example poll for to test time adopting workflow' ); await click('button[type="submit"]'); - assert.equal(currentRouteName(), "create.options"); + assert.equal(currentRouteName(), 'create.options'); await pageCreateOptions.selectDates(days); await click('button[type="submit"]'); - assert.equal(currentRouteName(), "create.options-datetime"); + assert.equal(currentRouteName(), 'create.options-datetime'); for (let i = 1; i <= 3; i++) { await click( @@ -621,32 +657,32 @@ module('Acceptance | create a poll', function(hooks) { .dom( `[data-test-day="${days[0].toISODate()}"] button[data-test-action="add"]` ) - .exists({ count: 4 }, "assumption: user created 4 time inputs"); + .exists({ count: 4 }, 'assumption: user created 4 time inputs'); for (const [index, inputEl] of findAll( `[data-test-day="${days[0].toISODate()}"] input[type="time"]` ).entries()) { - await fillIn(inputEl, `${(index * 6).toString().padStart(2, "0")}:00`); + await fillIn(inputEl, `${(index * 6).toString().padStart(2, '0')}:00`); } assert.deepEqual( findAll( `[data-test-day="${days[0].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["00:00", "06:00", "12:00", "18:00"], - "assumption: all 4 time inputs for first day are filled" + ['00:00', '06:00', '12:00', '18:00'], + 'assumption: all 4 time inputs for first day are filled' ); assert .dom(`[data-test-day="${days[1].toISODate()}"] input[type="time"]`) - .exists({ count: 1 }, "only one time input exists for second day") - .hasValue("", "time input for second day is empty"); + .exists({ count: 1 }, 'only one time input exists for second day') + .hasValue('', 'time input for second day is empty'); await click('button[data-test-action="adopt-times-of-first-day"]'); assert.deepEqual( findAll( `[data-test-day="${days[1].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["00:00", "06:00", "12:00", "18:00"], - "all 4 times from first day have been added to second day" + ['00:00', '06:00', '12:00', '18:00'], + 'all 4 times from first day have been added to second day' ); await click( @@ -658,8 +694,8 @@ module('Acceptance | create a poll', function(hooks) { findAll( `[data-test-day="${days[0].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["00:00", "06:00", "18:00"], - "assumption: one time has been deleted from first day" + ['00:00', '06:00', '18:00'], + 'assumption: one time has been deleted from first day' ); await click('button[data-test-action="adopt-times-of-first-day"]'); @@ -667,13 +703,13 @@ module('Acceptance | create a poll', function(hooks) { findAll( `[data-test-day="${days[1].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["00:00", "06:00", "18:00"], - "second day has been updated with changed times from first day" + ['00:00', '06:00', '18:00'], + 'second day has been updated with changed times from first day' ); await fillIn( findAll(`[data-test-day="${days[0].toISODate()}"] input[type="time"]`)[0], - "03:00" + '03:00' ); await click( findAll( @@ -682,14 +718,14 @@ module('Acceptance | create a poll', function(hooks) { ); await fillIn( findAll(`[data-test-day="${days[0].toISODate()}"] input[type="time"]`)[3], - "22:00" + '22:00' ); assert.deepEqual( findAll( `[data-test-day="${days[0].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["03:00", "06:00", "18:00", "22:00"], - "assumption: a fourth time has been added to the first day again" + ['03:00', '06:00', '18:00', '22:00'], + 'assumption: a fourth time has been added to the first day again' ); await click('button[data-test-action="adopt-times-of-first-day"]'); @@ -697,48 +733,44 @@ module('Acceptance | create a poll', function(hooks) { findAll( `[data-test-day="${days[1].toISODate()}"] input[type="time"]` ).map((el) => el.value), - ["03:00", "06:00", "18:00", "22:00"], - "second day has been updated with times from first day as expected" + ['03:00', '06:00', '18:00', '22:00'], + 'second day has been updated with times from first day as expected' ); await click('button[type="submit"]'); - assert.equal(currentRouteName(), "create.settings"); + assert.equal(currentRouteName(), 'create.settings'); await click('button[type="submit"]'); - assert.equal(currentRouteName(), "poll.participation"); + assert.equal(currentRouteName(), 'poll.participation'); assert.deepEqual( pagePollParticipation.options().labels, [ - Intl.DateTimeFormat("en-US", { - dateStyle: "full", - timeStyle: "short", + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', }).format(days[0].set({ hour: 3, minutes: 0 })), - "6:00 AM", - "6:00 PM", - "10:00 PM", - Intl.DateTimeFormat("en-US", { - dateStyle: "full", - timeStyle: "short", + '6:00 AM', + '6:00 PM', + '10:00 PM', + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', }).format(days[1].set({ hour: 3, minutes: 0 })), - "6:00 AM", - "6:00 PM", - "10:00 PM", + '6:00 AM', + '6:00 PM', + '10:00 PM', ], - "options are correctly labeled" + 'options are correctly labeled' ); }); - test('create a poll for answering a question with only one option', async function(assert) { + test('create a poll for answering a question with only one option', async function (assert) { await pageCreateIndex.visit(); - await pageCreateIndex - .pollType('MakeAPoll') - .next(); + await pageCreateIndex.pollType('MakeAPoll').next(); assert.equal(currentRouteName(), 'create.meta'); - await pageCreateMeta - .title('default poll') - .next(); + await pageCreateMeta.title('default poll').next(); assert.equal(currentRouteName(), 'create.options'); assert.equal( pageCreateOptions.textOptions().count, @@ -759,10 +791,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -780,11 +809,8 @@ module('Acceptance | create a poll', function(hooks) { ); }); - test('create a poll and use back button (find a date)', async function(assert) { - let days = [ - DateTime.fromISO('2016-01-02'), - DateTime.fromISO('2016-01-13'), - ]; + test('create a poll and use back button (find a date)', async function (assert) { + let days = [DateTime.fromISO('2016-01-02'), DateTime.fromISO('2016-01-13')]; setupBrowserNavigationButtons(); @@ -803,7 +829,9 @@ module('Acceptance | create a poll', function(hooks) { assert.equal(currentRouteName(), 'create.options-datetime'); assert.deepEqual( pageCreateOptionsDatetime.days().labels, - days.map((day) => Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(day)), + days.map((day) => + Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(day) + ), 'time inputs having days as label' ); @@ -815,7 +843,9 @@ module('Acceptance | create a poll', function(hooks) { await backButton(); assert.equal(currentRouteName(), 'create.options'); assert.deepEqual( - findAll('.ember-power-calendar-day--selected').map((el) => el.dataset.date), + findAll('.ember-power-calendar-day--selected').map( + (el) => el.dataset.date + ), days.map((day) => day.toISODate()), 'days are still present after back button is used' ); @@ -827,17 +857,17 @@ module('Acceptance | create a poll', function(hooks) { .hasValue('', 'time input the user has not touched is still empty'); assert .dom('[data-test-day="2016-01-13"] input[type="time"]') - .hasValue('10:00', 'time input is prefilled with the time user entered before using back button'); + .hasValue( + '10:00', + 'time input is prefilled with the time user entered before using back button' + ); await pageCreateOptionsDatetime.next(); assert.equal(currentRouteName(), 'create.settings'); await pageCreateSettings.save(); assert.equal(currentRouteName(), 'poll.participation'); - assert.ok( - pagePollParticipation.urlIsValid() === true, - 'poll url is valid' - ); + assert.true(pagePollParticipation.urlIsValid(), 'poll url is valid'); assert.equal( pagePollParticipation.title, 'default poll', @@ -851,28 +881,29 @@ module('Acceptance | create a poll', function(hooks) { assert.deepEqual( pagePollParticipation.options().labels, [ - Intl.DateTimeFormat('en-US', { dateStyle: "full" }).format(days[0]), - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(days[1].set({ hours: 10, minutes: 0 })), + Intl.DateTimeFormat('en-US', { dateStyle: 'full' }).format(days[0]), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(days[1].set({ hours: 10, minutes: 0 })), ], 'options are correctly labeled' ); }); - test('Start at first step is enforced', async function(assert) { + test('Start at first step is enforced', async function (assert) { await pageCreateSettings.visit(); assert.equal(currentRouteName(), 'create.index'); }); - test('back button', async function(assert) { + test('back button', async function (assert) { await pageCreateIndex.visit(); assert.equal(currentRouteName(), 'create.index'); await pageCreateIndex.next(); assert.equal(currentRouteName(), 'create.meta'); - await pageCreateMeta - .title('foo') - .next(); + await pageCreateMeta.title('foo').next(); assert.equal(currentRouteName(), 'create.options'); await pageCreateOptions.selectDates([new Date()]); @@ -894,9 +925,7 @@ module('Acceptance | create a poll', function(hooks) { await pageCreateMeta.back(); assert.equal(currentRouteName(), 'create.index'); - await pageCreateIndex - .pollType('MakeAPoll') - .next(); + await pageCreateIndex.pollType('MakeAPoll').next(); assert.equal(currentRouteName(), 'create.meta'); await pageCreateMeta.next(); @@ -917,92 +946,92 @@ module('Acceptance | create a poll', function(hooks) { assert.equal(currentRouteName(), 'create.index'); }); - module("validation", async function () { - test("validates user input when creating a poll with dates and times", async function (assert) { + module('validation', async function () { + test('validates user input when creating a poll with dates and times', async function (assert) { const day = DateTime.now(); - await visit("/create"); + await visit('/create'); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/meta", - "assumption: user can go to next step after selecting poll type" + '/create/meta', + 'assumption: user can go to next step after selecting poll type' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/meta", - "validation error prevents the user from going to option input before entering a title" + '/create/meta', + 'validation error prevents the user from going to option input before entering a title' ); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-invalid", - "input field for poll type is shown as invalid" + 'is-invalid', + 'input field for poll type is shown as invalid' ); assert .dom('[data-test-form-element="title"] .invalid-feedback') .hasText( - t("create.meta.input.title.validations.valueMissing"), - "shows a validation error for missing value" + t('create.meta.input.title.validations.valueMissing'), + 'shows a validation error for missing value' ); assert .dom('[data-test-form-element="description"] textarea') .hasClass( - "is-valid", - "textarea for entering description is shown as valid even if user has not entered a value" + 'is-valid', + 'textarea for entering description is shown as valid even if user has not entered a value' ); - await fillIn('[data-test-form-element="title"] input', "A"); + await fillIn('[data-test-form-element="title"] input', 'A'); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-invalid", - "input field for poll type is still shown as invalid after user entered a too short title" + 'is-invalid', + 'input field for poll type is still shown as invalid after user entered a too short title' ); assert .dom('[data-test-form-element="title"] .invalid-feedback') .hasText( - t("create.meta.input.title.validations.tooShort"), - "validation error message is updated to reflect too short value" + t('create.meta.input.title.validations.tooShort'), + 'validation error message is updated to reflect too short value' ); await fillIn( '[data-test-form-element="title"] input', - "When to have our next hackathon?" + 'When to have our next hackathon?' ); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-valid", - "input field for poll type is shown as valid after user entered a title" + 'is-valid', + 'input field for poll type is shown as valid after user entered a title' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options", - "assumption: user can go to next step after filling in poll title" + '/create/options', + 'assumption: user can go to next step after filling in poll title' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options", - "user can not skip options step without selecting at least one day" + '/create/options', + 'user can not skip options step without selecting at least one day' ); assert .dom('[data-test-form-element-for="days"] .form-control') .hasClass( - "is-invalid", - "shows calendar for date selection as invalid if user has selected no day" + 'is-invalid', + 'shows calendar for date selection as invalid if user has selected no day' ); assert .dom('[data-test-form-element-for="days"] .invalid-feedback') .hasText( - t("create.options.error.notEnoughDates"), - "shows validation error that at least one day needs to be selected" + t('create.options.error.notEnoughDates'), + 'shows validation error that at least one day needs to be selected' ); await calendarSelect( @@ -1012,29 +1041,29 @@ module('Acceptance | create a poll', function(hooks) { assert .dom('[data-test-form-element-for="days"] .form-control') .hasClass( - "is-valid", - "shows calendar for date selection as valid after user selected a date" + 'is-valid', + 'shows calendar for date selection as valid after user selected a date' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options-datetime", - "user can process to next step after selecting at least one day" + '/create/options-datetime', + 'user can process to next step after selecting at least one day' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/settings", - "user can skip time input for dates without entering any time" + '/create/settings', + 'user can skip time input for dates without entering any time' ); await click('button[data-test-action="back"]'); assert.strictEqual( currentURL(), - "/create/options-datetime", - "assumption: user can go back to time input step" + '/create/options-datetime', + 'assumption: user can go back to time input step' ); await click( @@ -1044,228 +1073,255 @@ module('Acceptance | create a poll', function(hooks) { .dom(`[data-test-day="${day.toISODate()}"] input[type="time"]`) .exists( { count: 2 }, - "assumption: user can add another time for the day" + 'assumption: user can add another time for the day' ); for (const el of findAll( `[data-test-day="${day.toISODate()}"] input[type="time"]` )) { - await fillIn(el, "10:00"); + await fillIn(el, '10:00'); } await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options-datetime", - "user can not go to next step when entering duplicated times for the same day" + '/create/options-datetime', + 'user can not go to next step when entering duplicated times for the same day' ); assert .dom( findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[0] ) - .hasClass("is-valid", "first input is shown as valid"); + .hasClass('is-valid', 'first input is shown as valid'); assert .dom( findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[1] ) .hasClass( - "is-invalid", - "second input with same time is shown as invalid" + 'is-invalid', + 'second input with same time is shown as invalid' ); assert .dom(`[data-test-day="${day.toISODate()}"] .invalid-feedback`) .exists( { count: 1 }, - "assumption: only one input has invalid feedback" + 'assumption: only one input has invalid feedback' ); assert .dom(`[data-test-day="${day.toISODate()}"] .invalid-feedback`) .hasText( - t("create.options-datetime.error.duplicatedDate"), - "validation error message tells that times must be unique" + t('create.options-datetime.error.duplicatedDate'), + 'validation error message tells that times must be unique' ); await fillIn( findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[1], - "12:00" + '12:00' ); assert .dom( findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[0] ) .hasClass( - "is-valid", - "first input is still shown as valid when user changes value of another input" + 'is-valid', + 'first input is still shown as valid when user changes value of another input' ); assert .dom( findAll(`[data-test-day="${day.toISODate()}"] input[type="time"]`)[1] ) .hasClass( - "is-valid", - "second input is shown as valid after user filled in another time" + 'is-valid', + 'second input is shown as valid after user filled in another time' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/settings", - "user can skip time input for dates without entering any time" + '/create/settings', + 'user can skip time input for dates without entering any time' ); await click('button[type="submit"]'); assert.strictEqual( currentRouteName(), - "poll.participation", - "user can finish the poll creation without changing any value on settings step" + 'poll.participation', + 'user can finish the poll creation without changing any value on settings step' ); }); - test("validates user input when creating a poll for answering a question", async function (assert) { - await visit("/create"); - await fillIn('[data-test-form-element="poll-type"] select', "MakeAPoll"); + test('validates user input when creating a poll for answering a question', async function (assert) { + await visit('/create'); + await fillIn('[data-test-form-element="poll-type"] select', 'MakeAPoll'); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/meta", - "assumption: user can go to next step after selecting poll type" + '/create/meta', + 'assumption: user can go to next step after selecting poll type' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/meta", - "validation error prevents the user from going to option input before entering a title" + '/create/meta', + 'validation error prevents the user from going to option input before entering a title' ); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-invalid", - "input field for poll type is shown as invalid" + 'is-invalid', + 'input field for poll type is shown as invalid' ); assert .dom('[data-test-form-element="title"] .invalid-feedback') .hasText( - t("create.meta.input.title.validations.valueMissing"), - "shows a validation error for missing value" + t('create.meta.input.title.validations.valueMissing'), + 'shows a validation error for missing value' ); assert .dom('[data-test-form-element="description"] textarea') .hasClass( - "is-valid", - "textarea for entering description is shown as valid even if user has not entered a value" + 'is-valid', + 'textarea for entering description is shown as valid even if user has not entered a value' ); - await fillIn('[data-test-form-element="title"] input', "A"); + await fillIn('[data-test-form-element="title"] input', 'A'); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-invalid", - "input field for poll type is still shown as invalid after user entered a too short title" + 'is-invalid', + 'input field for poll type is still shown as invalid after user entered a too short title' ); assert .dom('[data-test-form-element="title"] .invalid-feedback') .hasText( - t("create.meta.input.title.validations.tooShort"), - "validation error message is updated to reflect too short value" + t('create.meta.input.title.validations.tooShort'), + 'validation error message is updated to reflect too short value' ); await fillIn( '[data-test-form-element="title"] input', - "What dessert should we have?" + 'What dessert should we have?' ); assert .dom('[data-test-form-element="title"] input') .hasClass( - "is-valid", - "input field for poll type is shown as valid after user entered a title" + 'is-valid', + 'input field for poll type is shown as valid after user entered a title' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options", - "assumption: user can go to next step after filling in poll title" + '/create/options', + 'assumption: user can go to next step after filling in poll title' ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/options", - "user can not skip options step without filling out at least one option" + '/create/options', + 'user can not skip options step without filling out at least one option' ); assert .dom('[data-test-form-element="option"] input[type="text"]') .exists( { count: 2 }, - "assumption: two input fields for options exists" + 'assumption: two input fields for options exists' ); assert .dom('[data-test-form-element="option"][data-test-option="0"] input') - .hasClass("is-invalid", "input field for first option is invalid"); + .hasClass('is-invalid', 'input field for first option is invalid'); assert .dom('[data-test-form-element="option"][data-test-option="1"] input') - .hasClass("is-invalid", "input field for second option is invalid"); + .hasClass('is-invalid', 'input field for second option is invalid'); assert .dom( '[data-test-form-element="option"][data-test-option="0"] .invalid-feedback' ) .hasText( - t("create.options.error.valueMissing"), - "shown value missing validation error for first input" + t('create.options.error.valueMissing'), + 'shown value missing validation error for first input' ); assert .dom( '[data-test-form-element="option"][data-test-option="1"] .invalid-feedback' ) .hasText( - t("create.options.error.valueMissing"), - "shown value missing validation error for first input" + t('create.options.error.valueMissing'), + 'shown value missing validation error for first input' + ); + + await fillIn( + '[data-test-form-element="option"][data-test-option="0"] input', + 'Cheesecake' ); - - await fillIn('[data-test-form-element="option"][data-test-option="0"] input', 'Cheesecake'); assert .dom('[data-test-form-element="option"][data-test-option="0"] input') - .hasClass("is-valid", "input field for first option is valid after user entered a label"); + .hasClass( + 'is-valid', + 'input field for first option is valid after user entered a label' + ); assert .dom('[data-test-form-element="option"][data-test-option="1"] input') - .hasClass("is-invalid", "input field for second option is still invalid"); + .hasClass( + 'is-invalid', + 'input field for second option is still invalid' + ); - await fillIn('[data-test-form-element="option"][data-test-option="1"] input', 'Cheesecake'); + await fillIn( + '[data-test-form-element="option"][data-test-option="1"] input', + 'Cheesecake' + ); assert .dom('[data-test-form-element="option"][data-test-option="0"] input') - .hasClass("is-valid", "input field for first option is valid after user entered a value"); + .hasClass( + 'is-valid', + 'input field for first option is valid after user entered a value' + ); assert .dom('[data-test-form-element="option"][data-test-option="1"] input') - .hasClass("is-invalid", "input field for second option is still invalid if entering duplicated error"); + .hasClass( + 'is-invalid', + 'input field for second option is still invalid if entering duplicated error' + ); assert .dom( '[data-test-form-element="option"][data-test-option="1"] .invalid-feedback' ) .hasText( - t("create.options.error.duplicatedOption"), - "validation error message is updated to duplicated label" - ); + t('create.options.error.duplicatedOption'), + 'validation error message is updated to duplicated label' + ); - await fillIn('[data-test-form-element="option"][data-test-option="1"] input', 'Muffin'); + await fillIn( + '[data-test-form-element="option"][data-test-option="1"] input', + 'Muffin' + ); assert .dom('[data-test-form-element="option"][data-test-option="0"] input') - .hasClass("is-valid", "input field for first option is valid after user entered a value"); + .hasClass( + 'is-valid', + 'input field for first option is valid after user entered a value' + ); assert .dom('[data-test-form-element="option"][data-test-option="1"] input') - .hasClass("is-valid", "input field for second option is valid after filling in a unique value"); + .hasClass( + 'is-valid', + 'input field for second option is valid after filling in a unique value' + ); await click('button[type="submit"]'); assert.strictEqual( currentURL(), - "/create/settings", - "user can move to next step after entering valid values for the options" + '/create/settings', + 'user can move to next step after entering valid values for the options' ); await click('button[type="submit"]'); assert.strictEqual( currentRouteName(), - "poll.participation", - "user can finish the poll creation without changing any value on settings step" + 'poll.participation', + 'user can finish the poll creation without changing any value on settings step' ); }); }); diff --git a/tests/acceptance/i18n-test.js b/tests/acceptance/i18n-test.js index d5be9fd..021d359 100644 --- a/tests/acceptance/i18n-test.js +++ b/tests/acceptance/i18n-test.js @@ -2,21 +2,26 @@ import { fillIn, find, visit } from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; -module('Acceptance | i18n', function(hooks) { - hooks.beforeEach(function() { +module('Acceptance | i18n', function (hooks) { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'de'); }); setupApplicationTest(hooks); - test('locale is saved in localStorage', async function(assert) { + test('locale is saved in localStorage', async function (assert) { await visit('/'); - assert.equal(find('.language-select').value, 'de', 'picks up locale in locale storage'); + assert.equal( + find('.language-select').value, + 'de', + 'picks up locale in locale storage' + ); await fillIn('.language-select', 'en'); assert.equal(find('.language-select').value, 'en'); assert.equal( - window.localStorage.getItem('locale'), 'en', + window.localStorage.getItem('locale'), + 'en', 'persisted in localeStorage' ); }); diff --git a/tests/acceptance/legacy-support-test.js b/tests/acceptance/legacy-support-test.js index 39fb57e..7048e41 100644 --- a/tests/acceptance/legacy-support-test.js +++ b/tests/acceptance/legacy-support-test.js @@ -8,12 +8,12 @@ import pollParticipate from 'croodle/tests/helpers/poll-participate'; import PollParticipationPage from 'croodle/tests/pages/poll/participation'; import PollEvaluationPage from 'croodle/tests/pages/poll/evaluation'; -module('Acceptance | legacy support', function(hooks) { +module('Acceptance | legacy support', function (hooks) { let yesLabel; let maybeLabel; let noLabel; - hooks.beforeEach(function() { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'en'); }); @@ -21,58 +21,115 @@ module('Acceptance | legacy support', function(hooks) { setupIntl(hooks); setupMirage(hooks); - hooks.beforeEach(function() { + hooks.beforeEach(function () { yesLabel = t('answerTypes.yes.label').toString(); maybeLabel = t('answerTypes.maybe.label').toString(); noLabel = t('answerTypes.no.label').toString(); }); - - test('show a default poll created with v0.3.0', async function(assert) { + test('show a default poll created with v0.3.0', async function (assert) { const encryptionKey = '5MKFuNTKILUXw6RuqkAw6ooZw4k3mWWx98ZQw8vH'; let poll = this.server.create('poll', { encryptionKey, // property 'id' of answers has been renamed to 'type' in v0.4.0 - answers: [{ 'id': 'yes','labelTranslation': 'answerTypes.yes.label','icon': 'glyphicon glyphicon-thumbs-up','label': 'Ja' },{ 'id': 'maybe','labelTranslation': 'answerTypes.maybe.label','icon': 'glyphicon glyphicon-hand-right','label': 'Vielleicht' },{ 'id': 'no','labelTranslation': 'answerTypes.no.label','icon': 'glyphicon glyphicon-thumbs-down','label': 'Nein' }], - options: [{ 'title': '2015-12-24T17:00:00.000Z' },{ 'title': '2015-12-24T19:00:00.000Z' },{ 'title': '2015-12-31T22:59:00.000Z' }], + answers: [ + { + id: 'yes', + labelTranslation: 'answerTypes.yes.label', + icon: 'glyphicon glyphicon-thumbs-up', + label: 'Ja', + }, + { + id: 'maybe', + labelTranslation: 'answerTypes.maybe.label', + icon: 'glyphicon glyphicon-hand-right', + label: 'Vielleicht', + }, + { + id: 'no', + labelTranslation: 'answerTypes.no.label', + icon: 'glyphicon glyphicon-thumbs-down', + label: 'Nein', + }, + ], + options: [ + { title: '2015-12-24T17:00:00.000Z' }, + { title: '2015-12-24T19:00:00.000Z' }, + { title: '2015-12-31T22:59:00.000Z' }, + ], users: [ this.server.create('user', { encryptionKey, name: 'Fritz Bauer', // selections.value was renamed to selections.label // selections.id was renamed to selections.type - selections: [{ 'value': { 'id': 'yes','labelTranslation': 'answerTypes.yes.label','icon': 'glyphicon glyphicon-thumbs-up','label': 'Ja' } },{ 'value': { 'id': 'no','labelTranslation': 'answerTypes.no.label','icon': 'glyphicon glyphicon-thumbs-down','label': 'Nein' } },{ 'value': { 'id': 'no','labelTranslation': 'answerTypes.no.label','icon': 'glyphicon glyphicon-thumbs-down','label': 'Nein' } }], + selections: [ + { + value: { + id: 'yes', + labelTranslation: 'answerTypes.yes.label', + icon: 'glyphicon glyphicon-thumbs-up', + label: 'Ja', + }, + }, + { + value: { + id: 'no', + labelTranslation: 'answerTypes.no.label', + icon: 'glyphicon glyphicon-thumbs-down', + label: 'Nein', + }, + }, + { + value: { + id: 'no', + labelTranslation: 'answerTypes.no.label', + icon: 'glyphicon glyphicon-thumbs-down', + label: 'Nein', + }, + }, + ], // version tag had have wrong format - version: 'v0.3-0' - }) + version: 'v0.3-0', + }), ], // version tag had have wrong format - version: 'v0.3-0' + version: 'v0.3-0', }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.participation'); - assert.deepEqual( - PollParticipationPage.options().labels, - [ - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-24T17:00:00.000Z')), - Intl.DateTimeFormat('en-US', { timeStyle: "short" }).format(new Date('2015-12-24T19:00:00.000Z')), - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-31T22:59:00.000Z')), - ] - ); - assert.deepEqual( - PollParticipationPage.options().answers, - [yesLabel, maybeLabel, noLabel] - ); + assert.deepEqual(PollParticipationPage.options().labels, [ + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-24T17:00:00.000Z')), + Intl.DateTimeFormat('en-US', { timeStyle: 'short' }).format( + new Date('2015-12-24T19:00:00.000Z') + ), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-31T22:59:00.000Z')), + ]); + assert.deepEqual(PollParticipationPage.options().answers, [ + yesLabel, + maybeLabel, + noLabel, + ]); await switchTab('evaluation'); assert.equal(currentRouteName(), 'poll.evaluation'); - let participant = PollEvaluationPage.participants.filterBy('name', 'Fritz Bauer')[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Fritz Bauer' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, noLabel, noLabel], + participant.selections.map((_) => _.answer), + [yesLabel, noLabel, noLabel], 'participants table shows correct answers for new participant' ); @@ -82,21 +139,29 @@ module('Acceptance | legacy support', function(hooks) { await pollParticipate('Hermann Langbein', ['yes', 'maybe', 'yes']); assert.equal(currentRouteName(), 'poll.evaluation'); - participant = PollEvaluationPage.participants.filterBy('name', 'Hermann Langbein')[0]; + participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Hermann Langbein' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, maybeLabel, yesLabel], + participant.selections.map((_) => _.answer), + [yesLabel, maybeLabel, yesLabel], 'participants table shows correct answers for new participant' ); }); - test('show a poll using free text created with v0.3.0', async function(assert) { + test('show a poll using free text created with v0.3.0', async function (assert) { let encryptionKey = 'Rre6dAGOYLW9gYKOP4LhX7Qwfhe5Th3je0uKDtyy'; let poll = this.server.create('poll', { encryptionKey, answerType: 'FreeText', answers: [], - options: [{ 'title': 'apple pie' }, { 'title': 'pecan pie' }, { 'title': 'plum pie' }], + options: [ + { title: 'apple pie' }, + { title: 'pecan pie' }, + { title: 'plum pie' }, + ], pollType: 'MakeAPoll', users: [ this.server.create('user', { @@ -104,46 +169,59 @@ module('Acceptance | legacy support', function(hooks) { name: 'Paul Levi', // selections.value was renamed to selections.label // selections.id was renamed to selections.type - selections: [{ 'value': 'would be great!' }, { 'value': 'no way' }, { 'value': 'if I had to' }], + selections: [ + { value: 'would be great!' }, + { value: 'no way' }, + { value: 'if I had to' }, + ], // version tag had have wrong format - version: 'v0.3-0' - }) + version: 'v0.3-0', + }), ], // version tag had have wrong format - version: 'v0.3-0' + version: 'v0.3-0', }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.participation'); - assert.deepEqual( - PollParticipationPage.options().labels, - [ - 'apple pie', - 'pecan pie', - 'plum pie' - ] - ); + assert.deepEqual(PollParticipationPage.options().labels, [ + 'apple pie', + 'pecan pie', + 'plum pie', + ]); await switchTab('evaluation'); assert.equal(currentRouteName(), 'poll.evaluation'); - let participant = PollEvaluationPage.participants.filterBy('name', 'Paul Levi')[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Paul Levi' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), ['would be great!', 'no way', 'if I had to'], + participant.selections.map((_) => _.answer), + ['would be great!', 'no way', 'if I had to'], 'participants table shows correct answers for new participant' ); await switchTab('participation'); assert.equal(currentRouteName(), 'poll.participation'); - await pollParticipate('Hermann Langbein', ["I don't care", 'would be awesome', "can't imagine anything better"]); + await pollParticipate('Hermann Langbein', [ + "I don't care", + 'would be awesome', + "can't imagine anything better", + ]); assert.equal(currentRouteName(), 'poll.evaluation'); - participant = PollEvaluationPage.participants.filterBy('name', 'Hermann Langbein')[0]; + participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Hermann Langbein' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), ['I don\'t care', 'would be awesome', 'can\'t imagine anything better'], + participant.selections.map((_) => _.answer), + ["I don't care", 'would be awesome', "can't imagine anything better"], 'participants table shows correct answers for new participant' ); }); diff --git a/tests/acceptance/participate-in-a-poll-test.js b/tests/acceptance/participate-in-a-poll-test.js index c0eb362..6b7cb81 100644 --- a/tests/acceptance/participate-in-a-poll-test.js +++ b/tests/acceptance/participate-in-a-poll-test.js @@ -5,7 +5,7 @@ import { currentURL, currentRouteName, waitFor, - visit + visit, } from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; @@ -14,11 +14,11 @@ import { setupMirage } from 'ember-cli-mirage/test-support'; import PollEvaluationPage from 'croodle/tests/pages/poll/evaluation'; import pollParticipate from 'croodle/tests/helpers/poll-participate'; -module('Acceptance | participate in a poll', function(hooks) { +module('Acceptance | participate in a poll', function (hooks) { let yesLabel; let noLabel; - hooks.beforeEach(function() { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'en'); }); @@ -26,19 +26,23 @@ module('Acceptance | participate in a poll', function(hooks) { setupIntl(hooks); setupMirage(hooks); - hooks.beforeEach(function() { + hooks.beforeEach(function () { yesLabel = t('answerTypes.yes.label').toString(); noLabel = t('answerTypes.no.label').toString(); }); - test('participate in a default poll', async function(assert) { + test('participate in a default poll', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { - encryptionKey + encryptionKey, }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.equal(currentRouteName(), 'poll.participation', 'poll is redirected to poll.participation'); + assert.equal( + currentRouteName(), + 'poll.participation', + 'poll is redirected to poll.participation' + ); await pollParticipate('Max Meiner', ['yes', 'no']); assert.equal(currentRouteName(), 'poll.evaluation'); @@ -47,142 +51,202 @@ module('Acceptance | participate in a poll', function(hooks) { `encryptionKey=${encryptionKey}`, 'encryption key is part of query params' ); - assert.equal(PollEvaluationPage.participants.length, 1, 'user is added to participants table'); - let participant = PollEvaluationPage.participants.filterBy('name', 'Max Meiner')[0]; + assert.equal( + PollEvaluationPage.participants.length, + 1, + 'user is added to participants table' + ); + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Max Meiner' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, noLabel], + participant.selections.map((_) => _.answer), + [yesLabel, noLabel], 'participants table shows correct answers for new participant' ); await click('.nav .participation'); assert.equal(currentRouteName(), 'poll.participation'); assert.equal(find('.name input').value, '', 'input for name is cleared'); - assert.ok( - !findAll('input[type="radio"]').toArray().some((el) => el.checked), + assert.notOk( + findAll('input[type="radio"]') + .toArray() + .some((el) => el.checked), 'radios are cleared' ); await pollParticipate('Peter Müller', ['yes', 'yes']); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(PollEvaluationPage.participants.length, 2, 'user is added to participants table'); - participant = PollEvaluationPage.participants.filterBy('name', 'Peter Müller')[0]; + assert.equal( + PollEvaluationPage.participants.length, + 2, + 'user is added to participants table' + ); + participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Peter Müller' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, yesLabel], + participant.selections.map((_) => _.answer), + [yesLabel, yesLabel], 'participants table shows correct answers for new participant' ); }); - test('participate in a poll using freetext', async function(assert) { + test('participate in a poll using freetext', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { answerType: 'FreeText', answers: [], - encryptionKey + encryptionKey, }); - await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`) + await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.participation'); await pollParticipate('Max Manus', ['answer 1', 'answer 2']); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(PollEvaluationPage.participants.length, 1, 'user is added to participants table'); + assert.equal( + PollEvaluationPage.participants.length, + 1, + 'user is added to participants table' + ); - let participant = PollEvaluationPage.participants.filterBy('name', 'Max Manus')[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Max Manus' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), ['answer 1', 'answer 2'], + participant.selections.map((_) => _.answer), + ['answer 1', 'answer 2'], 'participants table shows correct answers for new participant' ); }); - test('participate in a poll which does not force an answer to all options', async function(assert) { + test('participate in a poll which does not force an answer to all options', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey, - forceAnswer: false + forceAnswer: false, }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); assert.equal(currentRouteName(), 'poll.participation'); await pollParticipate('Karl Käfer', ['yes', null]); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(PollEvaluationPage.participants.length, 1, 'user is added to participants table'); + assert.equal( + PollEvaluationPage.participants.length, + 1, + 'user is added to participants table' + ); - let participant = PollEvaluationPage.participants.filterBy('name', 'Karl Käfer')[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'Karl Käfer' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, ''], + participant.selections.map((_) => _.answer), + [yesLabel, ''], 'participants table shows correct answers for new participant' ); }); - test('participate in a poll which allows anonymous participation', async function(assert) { + test('participate in a poll which allows anonymous participation', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { anonymousUser: true, - encryptionKey + encryptionKey, }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); assert.equal(currentRouteName(), 'poll.participation'); await pollParticipate(null, ['yes', 'no']); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(PollEvaluationPage.participants.length, 1, 'user is added to participants table'); + assert.equal( + PollEvaluationPage.participants.length, + 1, + 'user is added to participants table' + ); let participant = PollEvaluationPage.participants.filterBy('name', '')[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, noLabel], + participant.selections.map((_) => _.answer), + [yesLabel, noLabel], 'participants table shows correct answers for new participant' ); }); - test('network connectivity errors', async function(assert) { + test('network connectivity errors', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { - encryptionKey + encryptionKey, }); this.server.post('/users', undefined, 503); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); assert.equal(currentRouteName(), 'poll.participation'); - assert.dom('[data-test-modal="saving-failed"] .modal-content') - .isNotVisible('failed saving notification is not shown before attempt to save'); + assert + .dom('[data-test-modal="saving-failed"] .modal-content') + .isNotVisible( + 'failed saving notification is not shown before attempt to save' + ); await pollParticipate('John Doe', ['yes', 'no']); - assert.dom('[data-test-modal="saving-failed"] .modal-content') + assert + .dom('[data-test-modal="saving-failed"] .modal-content') .isVisible('user gets notified that saving failed'); this.server.post('/users'); await click('[data-test-modal="saving-failed"] [data-test-button="retry"]'); - assert.dom('[data-test-modal="saving-failed"] .modal-content') - .isNotVisible('Notification is hidden after another save attempt was successful'); + assert + .dom('[data-test-modal="saving-failed"] .modal-content') + .isNotVisible( + 'Notification is hidden after another save attempt was successful' + ); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(PollEvaluationPage.participants.length, 1, 'user is added to participants table'); + assert.equal( + PollEvaluationPage.participants.length, + 1, + 'user is added to participants table' + ); - let participant = PollEvaluationPage.participants.filterBy('name', 'John Doe')[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + 'John Doe' + )[0]; assert.ok(participant, 'user exists in participants table'); assert.deepEqual( - participant.selections.map((_) => _.answer), [yesLabel, noLabel], + participant.selections.map((_) => _.answer), + [yesLabel, noLabel], 'participants table shows correct answers for new participant' ); }); - test('shows loading spinner while submitting', async function(assert) { + test('shows loading spinner while submitting', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { - encryptionKey + encryptionKey, }); let resolveSubmission; let resolveSubmissionWith; - this.server.post('/users', function(schema) { + this.server.post('/users', function (schema) { return new Promise((resolve) => { let attrs = this.normalizedRequestAttrs(); @@ -191,90 +255,143 @@ module('Acceptance | participate in a poll', function(hooks) { }); }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); pollParticipate('John Doe', ['yes', 'no']); await waitFor('[data-test-button="submit"] .spinner-border', { timeoutMessage: 'timeout while waiting for loading spinner to appear', }); - assert.ok(true, 'loading spinner shown cause otherwise there would have been a timeout'); + assert.ok( + true, + 'loading spinner shown cause otherwise there would have been a timeout' + ); // resolve promise for test to finish // need to resolve with a valid response cause otherwise Ember Data would throw resolveSubmission(resolveSubmissionWith); }); - module('validation', function() { - test('shows validation errors for participation form on submit', async function(assert) { + module('validation', function () { + test('shows validation errors for participation form on submit', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey, }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); await click('button[type="submit"]'); - assert.dom('[data-test-form-element="name"] input').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]').hasClass('is-invalid'); + assert + .dom('[data-test-form-element="name"] input') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]') + .hasClass('is-invalid'); assert.dom('[data-test-form-element="name"] input').isFocused(); - assert.equal(currentRouteName(), 'poll.participation', 'invalid form prevents a transition'); + assert.equal( + currentRouteName(), + 'poll.participation', + 'invalid form prevents a transition' + ); }); - test('does not show validation error for name if poll allows anonymous participation', async function(assert) { + test('does not show validation error for name if poll allows anonymous participation', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { anonymousUser: true, encryptionKey, }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); await click('button[type="submit"]'); assert.dom('[data-test-form-element="name"] input').hasClass('is-valid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]').hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]') + .hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]').isFocused(); - assert.equal(currentRouteName(), 'poll.participation', 'invalid form prevents a transition'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]') + .isFocused(); + assert.equal( + currentRouteName(), + 'poll.participation', + 'invalid form prevents a transition' + ); }); - test('does not show validation error for option inputs if poll does not force an answer to each option', async function(assert) { + test('does not show validation error for option inputs if poll does not force an answer to each option', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey, - forceAnswer: false + forceAnswer: false, }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); await click('button[type="submit"]'); - assert.dom('[data-test-form-element="name"] input').hasClass('is-invalid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]').hasClass('is-valid'); - assert.dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]').hasClass('is-valid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]').hasClass('is-valid'); - assert.dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]').hasClass('is-valid'); + assert + .dom('[data-test-form-element="name"] input') + .hasClass('is-invalid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="yes"]') + .hasClass('is-valid'); + assert + .dom('[data-test-form-element="option-2017-12-24"] input[id$="no"]') + .hasClass('is-valid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="yes"]') + .hasClass('is-valid'); + assert + .dom('[data-test-form-element="option-2018-01-01"] input[id$="no"]') + .hasClass('is-valid'); assert.dom('[data-test-form-element="name"] input').isFocused(); - assert.equal(currentRouteName(), 'poll.participation', 'invalid form prevents a transition'); + assert.equal( + currentRouteName(), + 'poll.participation', + 'invalid form prevents a transition' + ); }); - test('does not show validation errors while saving participation', async function(assert) { + test('does not show validation errors while saving participation', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { - encryptionKey + encryptionKey, }); let resolveSubmission; let resolveSubmissionWith; - this.server.post('/users', function(schema) { + this.server.post('/users', function (schema) { return new Promise((resolve) => { let attrs = this.normalizedRequestAttrs(); @@ -283,13 +400,17 @@ module('Acceptance | participate in a poll', function(hooks) { }); }); - await visit(`/poll/${poll.id}/participation?encryptionKey=${encryptionKey}`); + await visit( + `/poll/${poll.id}/participation?encryptionKey=${encryptionKey}` + ); pollParticipate('John Doe', ['yes', 'no']); await waitFor('[data-test-button="submit"] .spinner-border', { timeoutMessage: 'timeout while waiting for loading spinner to appear', }); - assert.dom('.is-invalid').doesNotExist('does not show any validation error'); + assert + .dom('.is-invalid') + .doesNotExist('does not show any validation error'); // resolve promise for test to finish // need to resolve with a valid response cause otherwise Ember Data would throw diff --git a/tests/acceptance/view-evaluation-test.js b/tests/acceptance/view-evaluation-test.js index c103f37..ffa34f3 100644 --- a/tests/acceptance/view-evaluation-test.js +++ b/tests/acceptance/view-evaluation-test.js @@ -2,13 +2,14 @@ import { findAll, currentRouteName, find, visit } from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; import { setupMirage } from 'ember-cli-mirage/test-support'; -import { setupIntl, t } from 'ember-intl/test-support';import switchTab from 'croodle/tests/helpers/switch-tab'; +import { setupIntl, t } from 'ember-intl/test-support'; +import switchTab from 'croodle/tests/helpers/switch-tab'; import PollEvaluationPage from 'croodle/tests/pages/poll/evaluation'; import { assign } from '@ember/polyfills'; import { DateTime } from 'luxon'; -module('Acceptance | view evaluation', function(hooks) { - hooks.beforeEach(function() { +module('Acceptance | view evaluation', function (hooks) { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'en'); }); @@ -16,23 +17,27 @@ module('Acceptance | view evaluation', function(hooks) { setupIntl(hooks); setupMirage(hooks); - test('evaluation summary is not present for poll without participants', async function(assert) { + test('evaluation summary is not present for poll without participants', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { - encryptionKey + encryptionKey, }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.participation'); await switchTab('evaluation'); - assert.equal(findAll('.tab-content .tab-pane .evaluation-summary').length, 0, 'evaluation summary is not present'); + assert.equal( + findAll('.tab-content .tab-pane .evaluation-summary').length, + 0, + 'evaluation summary is not present' + ); }); - test('evaluation is correct for FindADate (date-only)', async function(assert) { + test('evaluation is correct for FindADate (date-only)', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let user1 = this.server.create('user', { - id: "1-1", + id: '1-1', creationDate: DateTime.local().minus({ months: 8, weeks: 3 }).toISO(), encryptionKey, name: 'Maximilian', @@ -41,18 +46,18 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }); let user2 = this.server.create('user', { - id: "1-2", + id: '1-2', creationDate: DateTime.local().minus({ months: 3, weeks: 2 }).toISO(), encryptionKey, name: 'Peter', @@ -61,15 +66,15 @@ module('Acceptance | view evaluation', function(hooks) { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' + label: 'No', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }); let poll = this.server.create('poll', { id: '1', @@ -78,26 +83,27 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } + label: 'No', + }, ], encryptionKey, - options: [ - { title: '2015-12-12' }, - { title: '2016-01-01' } - ], - users: [user1, user2] + options: [{ title: '2015-12-12' }, { title: '2016-01-01' }], + users: [user1, user2], }); await visit(`/poll/${poll.id}/evaluation?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(findAll('.tab-content .tab-pane .evaluation-summary').length, 1, 'evaluation summary is present'); + assert.equal( + findAll('.tab-content .tab-pane .evaluation-summary').length, + 1, + 'evaluation summary is present' + ); assert.equal( find('.participants').textContent.trim(), t('poll.evaluation.participants', { count: 2 }).toString(), @@ -111,7 +117,7 @@ module('Acceptance | view evaluation', function(hooks) { assert.equal( find('.last-participation').textContent.trim(), t('poll.evaluation.lastParticipation', { - ago: '3 months ago' + ago: '3 months ago', }).toString(), 'shows last participation date' ); @@ -124,37 +130,56 @@ module('Acceptance | view evaluation', function(hooks) { assert .dom('[data-test-participant="1-1"] [data-test-value-for="name"]') - .hasText('Maximilian', 'shows expected name of first participant in participants table'); + .hasText( + 'Maximilian', + 'shows expected name of first participant in participants table' + ); assert .dom('[data-test-participant="1-2"] [data-test-value-for="name"]') - .hasText('Peter', 'shows expected name of second participant in participants table'); + .hasText( + 'Peter', + 'shows expected name of second participant in participants table' + ); assert .dom('[data-test-participant="1-1"] [data-test-value-for="2015-12-12"]') - .hasText('Yes', 'shows expected selection for first option of first participant'); + .hasText( + 'Yes', + 'shows expected selection for first option of first participant' + ); assert .dom('[data-test-participant="1-1"] [data-test-value-for="2016-01-01"]') - .hasText('Yes', 'shows expected selection for second option of first participant'); - + .hasText( + 'Yes', + 'shows expected selection for second option of first participant' + ); assert .dom('[data-test-participant="1-2"] [data-test-value-for="2015-12-12"]') - .hasText('No', 'shows expected selection for first option of second participant'); + .hasText( + 'No', + 'shows expected selection for first option of second participant' + ); assert .dom('[data-test-participant="1-2"] [data-test-value-for="2016-01-01"]') - .hasText('Yes', 'shows expected selection for second option of second participant'); + .hasText( + 'Yes', + 'shows expected selection for second option of second participant' + ); assert.deepEqual( - findAll('[data-test-participant] [data-test-value-for="name"]').map((el) => el.textContent.trim()), + findAll('[data-test-participant] [data-test-value-for="name"]').map( + (el) => el.textContent.trim() + ), ['Maximilian', 'Peter'], 'Participants are ordered as correctly in participants table' ); }); - test('evaluation is correct for FindADate (datetime)', async function(assert) { + test('evaluation is correct for FindADate (datetime)', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let user1 = this.server.create('user', { - id: "1-1", + id: '1-1', creationDate: DateTime.local().minus({ months: 8, weeks: 3 }).toISO(), encryptionKey, name: 'Maximilian', @@ -163,24 +188,24 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' + label: 'No', }, - ] + ], }); let user2 = this.server.create('user', { - id: "1-2", + id: '1-2', creationDate: DateTime.local().minus({ months: 3, weeks: 2 }).toISO(), encryptionKey, name: 'Peter', @@ -189,21 +214,21 @@ module('Acceptance | view evaluation', function(hooks) { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' + label: 'No', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }); let poll = this.server.create('poll', { id: '1', @@ -212,27 +237,31 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } + label: 'No', + }, ], encryptionKey, options: [ { title: DateTime.fromISO('2015-12-12T06:06').toISO() }, { title: DateTime.fromISO('2015-12-12T12:12').toISO() }, - { title: DateTime.fromISO('2016-01-01T18:18').toISO() } + { title: DateTime.fromISO('2016-01-01T18:18').toISO() }, ], - users: [user1, user2] + users: [user1, user2], }); await visit(`/poll/${poll.id}/evaluation?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(findAll('.tab-content .tab-pane .evaluation-summary').length, 1, 'evaluation summary is present'); + assert.equal( + findAll('.tab-content .tab-pane .evaluation-summary').length, + 1, + 'evaluation summary is present' + ); assert.equal( find('.participants').textContent.trim(), t('poll.evaluation.participants', { count: 2 }).toString(), @@ -246,58 +275,111 @@ module('Acceptance | view evaluation', function(hooks) { assert.equal( find('.last-participation').textContent.trim(), t('poll.evaluation.lastParticipation', { - ago: '3 months ago' + ago: '3 months ago', }).toString(), 'shows last participation date' ); assert.deepEqual( - findAll('table thead tr:first-child th').map((el) => el.textContent.trim()), + findAll('table thead tr:first-child th').map((el) => + el.textContent.trim() + ), ['', 'Saturday, December 12, 2015', 'Friday, January 1, 2016'], 'lists days as first row in table header of parcipants table' ); assert.deepEqual( - findAll('table thead tr:last-child th').map((el) => el.textContent.trim()), + findAll('table thead tr:last-child th').map((el) => + el.textContent.trim() + ), ['', '6:06 AM', '12:12 PM', '6:18 PM'], 'lists times as second row in table header of parcipants table' ); assert .dom('[data-test-participant="1-1"] [data-test-value-for="name"]') - .hasText('Maximilian', 'shows expected name of first participant in participants table'); + .hasText( + 'Maximilian', + 'shows expected name of first participant in participants table' + ); assert .dom('[data-test-participant="1-2"] [data-test-value-for="name"]') - .hasText('Peter', 'shows expected name of second participant in participants table'); + .hasText( + 'Peter', + 'shows expected name of second participant in participants table' + ); assert - .dom(`[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO('2015-12-12T06:06').toISO()}"]`) - .hasText('Yes', 'shows expected selection for first option of first participant'); + .dom( + `[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO( + '2015-12-12T06:06' + ).toISO()}"]` + ) + .hasText( + 'Yes', + 'shows expected selection for first option of first participant' + ); assert - .dom(`[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO('2015-12-12T12:12').toISO()}"]`) - .hasText('Yes', 'shows expected selection for second option of first participant'); + .dom( + `[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO( + '2015-12-12T12:12' + ).toISO()}"]` + ) + .hasText( + 'Yes', + 'shows expected selection for second option of first participant' + ); assert - .dom(`[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO('2016-01-01T18:18').toISO()}"]`) - .hasText('No', 'shows expected selection for third option of first participant'); - + .dom( + `[data-test-participant="1-1"] [data-test-value-for="${DateTime.fromISO( + '2016-01-01T18:18' + ).toISO()}"]` + ) + .hasText( + 'No', + 'shows expected selection for third option of first participant' + ); assert - .dom(`[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO('2015-12-12T06:06').toISO()}"]`) - .hasText('No', 'shows expected selection for first option of second participant'); + .dom( + `[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO( + '2015-12-12T06:06' + ).toISO()}"]` + ) + .hasText( + 'No', + 'shows expected selection for first option of second participant' + ); assert - .dom(`[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO('2015-12-12T12:12').toISO()}"]`) - .hasText('Yes', 'shows expected selection for second option of second participant'); + .dom( + `[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO( + '2015-12-12T12:12' + ).toISO()}"]` + ) + .hasText( + 'Yes', + 'shows expected selection for second option of second participant' + ); assert - .dom(`[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO('2016-01-01T18:18').toISO()}"]`) - .hasText('Yes', 'shows expected selection for third option of second participant'); + .dom( + `[data-test-participant="1-2"] [data-test-value-for="${DateTime.fromISO( + '2016-01-01T18:18' + ).toISO()}"]` + ) + .hasText( + 'Yes', + 'shows expected selection for third option of second participant' + ); assert.deepEqual( - findAll('[data-test-participant] [data-test-value-for="name"]').map((el) => el.textContent.trim()), + findAll('[data-test-participant] [data-test-value-for="name"]').map( + (el) => el.textContent.trim() + ), ['Maximilian', 'Peter'], 'Participants are ordered as correctly in participants table' ); }); - test('evaluation is correct for MakeAPoll', async function(assert) { + test('evaluation is correct for MakeAPoll', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let usersData = [ { @@ -309,15 +391,15 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }, { creationDate: DateTime.local().minus({ days: 3 }).toISO(), @@ -328,15 +410,15 @@ module('Acceptance | view evaluation', function(hooks) { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' + label: 'No', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }, ]; let pollData = { @@ -345,27 +427,33 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } + label: 'No', + }, ], encryptionKey, - options: [ - { title: 'first option' }, - { title: 'second option' } - ], + options: [{ title: 'first option' }, { title: 'second option' }], pollType: 'MakeAPoll', }; - let poll = this.server.create('poll', assign(pollData, { users: usersData.map((_) => this.server.create('user', _)) })); + let poll = this.server.create( + 'poll', + assign(pollData, { + users: usersData.map((_) => this.server.create('user', _)), + }) + ); await visit(`/poll/${poll.id}/evaluation?encryptionKey=${encryptionKey}`); assert.equal(currentRouteName(), 'poll.evaluation'); - assert.equal(findAll('.tab-content .tab-pane .evaluation-summary').length, 1, 'evaluation summary is present'); + assert.equal( + findAll('.tab-content .tab-pane .evaluation-summary').length, + 1, + 'evaluation summary is present' + ); assert.equal( find('.participants').textContent.trim(), t('poll.evaluation.participants', { count: 2 }).toString(), @@ -383,11 +471,15 @@ module('Acceptance | view evaluation', function(hooks) { 'dates are used as table headers' ); assert.deepEqual( - PollEvaluationPage.participants.map((_) => _.name), usersData.map((_) => _.name), + PollEvaluationPage.participants.map((_) => _.name), + usersData.map((_) => _.name), 'users are listed in participants table with their names' ); usersData.forEach((user) => { - let participant = PollEvaluationPage.participants.filterBy('name', user.name)[0]; + let participant = PollEvaluationPage.participants.filterBy( + 'name', + user.name + )[0]; assert.deepEqual( participant.selections.map((_) => _.answer), user.selections.map((_) => t(_.labelTranslation).toString()), @@ -398,13 +490,13 @@ module('Acceptance | view evaluation', function(hooks) { assert.equal( find('.last-participation').textContent.trim(), t('poll.evaluation.lastParticipation', { - ago: '3 days ago' + ago: '3 days ago', }).toString(), 'last participation is evaluated correctly' ); }); - test('could open evaluation by tab from poll participation', async function(assert) { + test('could open evaluation by tab from poll participation', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { answers: [ @@ -412,20 +504,17 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } + label: 'No', + }, ], encryptionKey, - options: [ - { title: '2015-12-12' }, - { title: '2016-01-01' } - ], + options: [{ title: '2015-12-12' }, { title: '2016-01-01' }], users: [ this.server.create('user', { creationDate: '2015-01-01T00:00:00.000Z', @@ -436,15 +525,15 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] + label: 'Yes', + }, + ], }), this.server.create('user', { creationDate: '2015-08-01T00:00:00.000Z', @@ -455,17 +544,17 @@ module('Acceptance | view evaluation', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { id: 'no', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' - } - ] - }) - ] + label: 'Yes', + }, + ], + }), + ], }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); diff --git a/tests/acceptance/view-poll-test.js b/tests/acceptance/view-poll-test.js index 3bf30eb..4344c8d 100644 --- a/tests/acceptance/view-poll-test.js +++ b/tests/acceptance/view-poll-test.js @@ -1,4 +1,9 @@ -import { click, currentURL, currentRouteName, visit } from '@ember/test-helpers'; +import { + click, + currentURL, + currentRouteName, + visit, +} from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupApplicationTest } from 'ember-qunit'; import { setupMirage } from 'ember-cli-mirage/test-support'; @@ -8,15 +13,15 @@ import pageEvaluation from 'croodle/tests/pages/poll/evaluation'; import { DateTime } from 'luxon'; import { triggerCopySuccess } from 'ember-cli-clipboard/test-support'; -module('Acceptance | view poll', function(hooks) { - hooks.beforeEach(function() { +module('Acceptance | view poll', function (hooks) { + hooks.beforeEach(function () { window.localStorage.setItem('locale', 'en'); }); setupApplicationTest(hooks); setupMirage(hooks); - test('poll url', async function(assert) { + test('poll url', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz012345789'; let poll = this.server.create('poll', { encryptionKey }); let pollUrl = `/poll/${poll.id}?encryptionKey=${encryptionKey}`; @@ -35,10 +40,10 @@ module('Acceptance | view poll', function(hooks) { * * Can't test if flash message is shown due to * https://github.com/poteto/ember-cli-flash/issues/202 - */ + */ }); - test('shows a warning if poll is about to be expired', async function(assert) { + test('shows a warning if poll is about to be expired', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey, @@ -46,34 +51,26 @@ module('Acceptance | view poll', function(hooks) { }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.ok( - pageParticipation.showsExpirationWarning - ); + assert.ok(pageParticipation.showsExpirationWarning); }); - test('view a poll with dates', async function(assert) { + test('view a poll with dates', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey, - options: [ - { title: '2015-12-12' }, - { title: '2016-01-01' } - ] + options: [{ title: '2015-12-12' }, { title: '2016-01-01' }], }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.deepEqual( - pageParticipation.options().labels, - [ - 'Saturday, December 12, 2015', - 'Friday, January 1, 2016' - ] - ); + assert.deepEqual(pageParticipation.options().labels, [ + 'Saturday, December 12, 2015', + 'Friday, January 1, 2016', + ]); }); - test('view a poll with dates and times', async function(assert) { + test('view a poll with dates and times', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; - let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone ; + let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; let poll = this.server.create('poll', { encryptionKey, expirationDate: DateTime.local().plus({ years: 1 }).toISO(), @@ -84,39 +81,37 @@ module('Acceptance | view poll', function(hooks) { // time zone as UTC rather than local time { title: DateTime.fromISO('2015-12-12T11:11:00').toISO() }, { title: DateTime.fromISO('2015-12-12T13:13:00').toISO() }, - { title: DateTime.fromISO('2016-01-01T11:11:00').toISO() } + { title: DateTime.fromISO('2016-01-01T11:11:00').toISO() }, ], - timezone + timezone, }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.deepEqual( - pageParticipation.options().labels, - [ - // full date - 'Saturday, December 12, 2015 at 11:11 AM', - // only time cause day is repeated - '1:13 PM', - // full date cause day changed - 'Friday, January 1, 2016 at 11:11 AM', - ] - ); + assert.deepEqual(pageParticipation.options().labels, [ + // full date + 'Saturday, December 12, 2015 at 11:11 AM', + // only time cause day is repeated + '1:13 PM', + // full date cause day changed + 'Friday, January 1, 2016 at 11:11 AM', + ]); assert.notOk( pageParticipation.showsExpirationWarning, 'does not show an expiration warning if poll will not expire in next weeks' ); }); - test('view a poll while timezone differs from the one poll got created in and choose local timezone', async function(assert) { + test('view a poll while timezone differs from the one poll got created in and choose local timezone', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; - let timezoneUser = Intl.DateTimeFormat().resolvedOptions().timeZone ; - let timezonePoll = timezoneUser !== 'America/Caracas' ? 'America/Caracas' : 'Europe/Moscow'; + let timezoneUser = Intl.DateTimeFormat().resolvedOptions().timeZone; + let timezonePoll = + timezoneUser !== 'America/Caracas' ? 'America/Caracas' : 'Europe/Moscow'; let poll = this.server.create('poll', { encryptionKey, isDateTime: true, options: [ { title: '2015-12-12T11:11:00.000Z' }, - { title: '2016-01-01T11:11:00.000Z' } + { title: '2016-01-01T11:11:00.000Z' }, ], timezone: timezonePoll, users: [ @@ -127,50 +122,61 @@ module('Acceptance | view poll', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } - ] - }) - ] + label: 'No', + }, + ], + }), + ], }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.dom('[data-test-modal="choose-timezone"]') + assert + .dom('[data-test-modal="choose-timezone"]') .exists('user is asked which timezone should be used'); - await click('[data-test-modal="choose-timezone"] [data-test-button="use-local-timezone"]'); - assert.deepEqual( - pageParticipation.options().labels, - [ - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-12T11:11:00.000Z')), - Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(new Date('2016-01-01T11:11:00.000Z')), - ] + await click( + '[data-test-modal="choose-timezone"] [data-test-button="use-local-timezone"]' ); - assert.dom('[data-test-modal="choose-timezone"]').doesNotExist('modal is closed'); + assert.deepEqual(pageParticipation.options().labels, [ + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-12T11:11:00.000Z')), + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2016-01-01T11:11:00.000Z')), + ]); + assert + .dom('[data-test-modal="choose-timezone"]') + .doesNotExist('modal is closed'); await switchTab('evaluation'); - assert.deepEqual( - pageEvaluation.preferedOptions, - [Intl.DateTimeFormat('en-US', { dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-12T11:11:00.000Z'))] - ); + assert.deepEqual(pageEvaluation.preferedOptions, [ + Intl.DateTimeFormat('en-US', { + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-12T11:11:00.000Z')), + ]); }); - test('view a poll while timezone differs from the one poll got created in and choose poll timezone', async function(assert) { + test('view a poll while timezone differs from the one poll got created in and choose poll timezone', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; - let timezoneUser = Intl.DateTimeFormat().resolvedOptions().timeZone ; - let timezonePoll = timezoneUser !== 'America/Caracas' ? 'America/Caracas' : 'Europe/Moscow'; + let timezoneUser = Intl.DateTimeFormat().resolvedOptions().timeZone; + let timezonePoll = + timezoneUser !== 'America/Caracas' ? 'America/Caracas' : 'Europe/Moscow'; let poll = this.server.create('poll', { encryptionKey, isDateTime: true, options: [ { title: '2015-12-12T11:11:00.000Z' }, - { title: '2016-01-01T11:11:00.000Z' } + { title: '2016-01-01T11:11:00.000Z' }, ], timezone: timezonePoll, users: [ @@ -181,61 +187,94 @@ module('Acceptance | view poll', function(hooks) { type: 'yes', labelTranslation: 'answerTypes.yes.label', icon: 'glyphicon glyphicon-thumbs-up', - label: 'Yes' + label: 'Yes', }, { type: 'no', labelTranslation: 'answerTypes.no.label', icon: 'glyphicon glyphicon-thumbs-down', - label: 'No' - } - ] - }) - ] + label: 'No', + }, + ], + }), + ], }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.dom('[data-test-modal="choose-timezone"]') + assert + .dom('[data-test-modal="choose-timezone"]') .exists('user is asked which timezone should be used'); - await click('[data-test-modal="choose-timezone"] [data-test-button="use-poll-timezone"]'); - assert.deepEqual( - pageParticipation.options().labels, - [ - Intl.DateTimeFormat('en-US', { timeZone: timezonePoll, dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-12T11:11:00.000Z')), - Intl.DateTimeFormat('en-US', { timeZone: timezonePoll, dateStyle: "full", timeStyle: "short" }).format(new Date('2016-01-01T11:11:00.000Z')), - ] + await click( + '[data-test-modal="choose-timezone"] [data-test-button="use-poll-timezone"]' ); - assert.dom('[data-test-modal="choose-timezone"]').doesNotExist('modal is closed'); + assert.deepEqual(pageParticipation.options().labels, [ + Intl.DateTimeFormat('en-US', { + timeZone: timezonePoll, + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-12T11:11:00.000Z')), + Intl.DateTimeFormat('en-US', { + timeZone: timezonePoll, + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2016-01-01T11:11:00.000Z')), + ]); + assert + .dom('[data-test-modal="choose-timezone"]') + .doesNotExist('modal is closed'); await switchTab('evaluation'); - assert.deepEqual( - pageEvaluation.preferedOptions, - [Intl.DateTimeFormat('en-US', { timeZone: timezonePoll, dateStyle: "full", timeStyle: "short" }).format(new Date('2015-12-12T11:11:00.000Z')),] - ); + assert.deepEqual(pageEvaluation.preferedOptions, [ + Intl.DateTimeFormat('en-US', { + timeZone: timezonePoll, + dateStyle: 'full', + timeStyle: 'short', + }).format(new Date('2015-12-12T11:11:00.000Z')), + ]); }); - test('shows error page if poll does not exist', async function(assert) { + test('shows error page if poll does not exist', async function (assert) { let pollId = 'not-existing'; let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; await visit(`/poll/${pollId}?encryptionKey=${encryptionKey}`); - assert.equal(currentURL(), `/poll/${pollId}?encryptionKey=${encryptionKey}`, 'shows URL entered by user'); - assert.equal(currentRouteName(), 'poll_error', 'shows error substate of poll route'); - assert.dom('[data-test-error-type]').hasAttribute('data-test-error-type', 'not-found'); + assert.equal( + currentURL(), + `/poll/${pollId}?encryptionKey=${encryptionKey}`, + 'shows URL entered by user' + ); + assert.equal( + currentRouteName(), + 'poll_error', + 'shows error substate of poll route' + ); + assert + .dom('[data-test-error-type]') + .hasAttribute('data-test-error-type', 'not-found'); }); - test('shows error page if encryption key is wrong', async function(assert) { + test('shows error page if encryption key is wrong', async function (assert) { let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; let poll = this.server.create('poll', { encryptionKey: 'anotherkey' }); await visit(`/poll/${poll.id}?encryptionKey=${encryptionKey}`); - assert.equal(currentURL(), `/poll/${poll.id}?encryptionKey=${encryptionKey}`, 'shows URL entered by user'); - assert.equal(currentRouteName(), 'poll_error', 'shows error substate of poll route'); - assert.dom('[data-test-error-type]').hasAttribute('data-test-error-type', 'decryption-failed'); + assert.equal( + currentURL(), + `/poll/${poll.id}?encryptionKey=${encryptionKey}`, + 'shows URL entered by user' + ); + assert.equal( + currentRouteName(), + 'poll_error', + 'shows error substate of poll route' + ); + assert + .dom('[data-test-error-type]') + .hasAttribute('data-test-error-type', 'decryption-failed'); }); - test('shows error page if server returns a 500', async function(assert) { + test('shows error page if server returns a 500', async function (assert) { let pollId = 'not-existing'; let encryptionKey = 'abcdefghijklmnopqrstuvwxyz0123456789'; @@ -243,8 +282,18 @@ module('Acceptance | view poll', function(hooks) { this.server.get('polls/:id', () => {}, 500); await visit(`/poll/${pollId}?encryptionKey=${encryptionKey}`); - assert.equal(currentURL(), `/poll/${pollId}?encryptionKey=${encryptionKey}`, 'shows URL entered by user'); - assert.equal(currentRouteName(), 'poll_error', 'shows error substate of poll route'); - assert.dom('[data-test-error-type]').hasAttribute('data-test-error-type', 'unexpected'); - }) + assert.equal( + currentURL(), + `/poll/${pollId}?encryptionKey=${encryptionKey}`, + 'shows URL entered by user' + ); + assert.equal( + currentRouteName(), + 'poll_error', + 'shows error substate of poll route' + ); + assert + .dom('[data-test-error-type]') + .hasAttribute('data-test-error-type', 'unexpected'); + }); }); diff --git a/tests/assertions/async-throws.js b/tests/assertions/async-throws.js index a28263b..ee01a65 100644 --- a/tests/assertions/async-throws.js +++ b/tests/assertions/async-throws.js @@ -47,14 +47,14 @@ export default async function asyncThrows(f, expectedErrorMessage) { result, expected: expectedErrorMessage, actual: errorText, - message: `Expected to see error '${expectedErrorMessage}'` + message: `Expected to see error '${expectedErrorMessage}'`, }); } else { this.pushResult({ result: false, expected: '', actual: errorText, - message: `You're using asyncThrows but you didn't add text to the assertion. Add some text as the second argument so the actual exception being thrown is what you expect it is.` + message: `You're using asyncThrows but you didn't add text to the assertion. Add some text as the second argument so the actual exception being thrown is what you expect it is.`, }); } diff --git a/tests/helpers/poll-has-user.js b/tests/helpers/poll-has-user.js index 974d2e7..a9944d0 100644 --- a/tests/helpers/poll-has-user.js +++ b/tests/helpers/poll-has-user.js @@ -22,11 +22,7 @@ function pollHasUsersCount(assert, count, message) { if (isEmpty(message)) { message = 'poll has expected count of users'; } - assert.equal( - findAll('.user').length, - count, - message - ); + assert.equal(findAll('.user').length, count, message); } export default pollHasUser; diff --git a/tests/helpers/poll-participate.js b/tests/helpers/poll-participate.js index de92a34..ad63c93 100644 --- a/tests/helpers/poll-participate.js +++ b/tests/helpers/poll-participate.js @@ -1,23 +1,31 @@ import { isEmpty } from '@ember/utils'; -import { findAll, fillIn, click, settled } from '@ember/test-helpers'; +import { findAll, fillIn, click } from '@ember/test-helpers'; -export default async function(name, selections) { +export default async function (name, selections) { if (!isEmpty(name)) { await fillIn('.participation .name input', name); } - const isFreeText = findAll('.participation .selections .radio').length > 0 ? false : true; + const isFreeText = + findAll('.participation .selections .radio').length > 0 ? false : true; for (let [index, selection] of selections.entries()) { if (!isEmpty(selection)) { if (isFreeText) { - await fillIn(`.participation .selections .form-group:nth-child(${index + 1}) input`, selection); + await fillIn( + `.participation .selections .form-group:nth-child(${ + index + 1 + }) input`, + selection + ); } else { - await click(`.participation .selections .form-group:nth-child(${index + 1}) .${selection}.radio input`); + await click( + `.participation .selections .form-group:nth-child(${ + index + 1 + }) .${selection}.radio input` + ); } } } await click('.participation button[type="submit"]'); - - await settled(); } diff --git a/tests/helpers/switch-tab.js b/tests/helpers/switch-tab.js index fc189da..7002580 100644 --- a/tests/helpers/switch-tab.js +++ b/tests/helpers/switch-tab.js @@ -1,5 +1,5 @@ import { click } from '@ember/test-helpers'; -export default function(tab) { +export default function (tab) { return click(`.nav-tabs .${tab} a`); } diff --git a/tests/index.html b/tests/index.html index 423ff05..e54aeca 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,7 +21,14 @@ {{content-for "body"}} {{content-for "test-body"}} - +
    +
    +
    +
    +
    +
    + + diff --git a/tests/integration/components/back-button-test.js b/tests/integration/components/back-button-test.js index 2512204..1570dad 100644 --- a/tests/integration/components/back-button-test.js +++ b/tests/integration/components/back-button-test.js @@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | back-button', function(hooks) { +module('Integration | Component | back-button', function (hooks) { setupRenderingTest(hooks); - test('it renders a button', async function(assert) { + test('it renders a button', async function (assert) { await render(hbs``); assert.dom('button').exists(); diff --git a/tests/integration/components/create-options-datetime-test.js b/tests/integration/components/create-options-datetime-test.js index 5499f98..1efabdd 100644 --- a/tests/integration/components/create-options-datetime-test.js +++ b/tests/integration/components/create-options-datetime-test.js @@ -1,14 +1,14 @@ import { run } from '@ember/runloop'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { render, click, find, findAll } from "@ember/test-helpers"; +import { render, click, find, findAll } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; import { DateTime } from 'luxon'; -module('Integration | Component | create options datetime', function(hooks) { +module('Integration | Component | create options datetime', function (hooks) { setupRenderingTest(hooks); - hooks.beforeEach(function() { + hooks.beforeEach(function () { this.store = this.owner.lookup('service:store'); }); @@ -19,18 +19,19 @@ module('Integration | Component | create options datetime', function(hooks) { * that ones could be identifed by class 'ws-inputreplace' */ - test('it generates input field for options iso 8601 date string (without time)', async function(assert) { + test('it generates input field for options iso 8601 date string (without time)', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as // it's owner run(() => { - this.set('poll', this.store.createRecord('poll', { - pollType: 'FindADate', - options: [ - { title: '2015-01-01' } - ] - })); + this.set( + 'poll', + this.store.createRecord('poll', { + pollType: 'FindADate', + options: [{ title: '2015-01-01' }], + }) + ); }); await render(hbs`{{create-options-datetime dates=poll.options}}`); @@ -46,18 +47,19 @@ module('Integration | Component | create options datetime', function(hooks) { ); }); - test('it generates input field for options iso 8601 datetime string (with time)', async function(assert) { + test('it generates input field for options iso 8601 datetime string (with time)', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as // it's owner run(() => { - this.set('poll', this.store.createRecord('poll', { - pollType: 'FindADate', - options: [ - { title: '2015-01-01T11:11:00.000Z' } - ] - })); + this.set( + 'poll', + this.store.createRecord('poll', { + pollType: 'FindADate', + options: [{ title: '2015-01-01T11:11:00.000Z' }], + }) + ); }); await render(hbs`{{create-options-datetime dates=poll.options}}`); @@ -73,20 +75,23 @@ module('Integration | Component | create options datetime', function(hooks) { ); }); - test('it hides repeated labels', async function(assert) { + test('it hides repeated labels', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as // it's owner run(() => { - this.set('poll', this.store.createRecord('poll', { - pollType: 'FindADate', - options: [ - { title: DateTime.fromISO('2015-01-01T10:11').toISO() }, - { title: DateTime.fromISO('2015-01-01T22:22').toISO() }, - { title: '2015-02-02' } - ] - })); + this.set( + 'poll', + this.store.createRecord('poll', { + pollType: 'FindADate', + options: [ + { title: DateTime.fromISO('2015-01-01T10:11').toISO() }, + { title: DateTime.fromISO('2015-01-01T22:22').toISO() }, + { title: '2015-02-02' }, + ], + }) + ); }); await render(hbs`{{create-options-datetime dates=poll.options}}`); @@ -101,31 +106,37 @@ module('Integration | Component | create options datetime', function(hooks) { 'there are two not hidden labels for two different dates' ); assert.notOk( - findAll('.days .form-group')[0].querySelector('label').classList.contains('sr-only'), + findAll('.days .form-group')[0] + .querySelector('label') + .classList.contains('sr-only'), 'the first label is shown' ); assert.ok( - findAll('.days .form-group')[1].querySelector('label').classList.contains('sr-only'), + findAll('.days .form-group')[1] + .querySelector('label') + .classList.contains('sr-only'), 'the repeated label on second form-group is hidden by sr-only class' ); assert.notOk( - findAll('.days .form-group')[2].querySelector('label').classList.contains('sr-only'), + findAll('.days .form-group')[2] + .querySelector('label') + .classList.contains('sr-only'), 'the new label on third form-group is shown' ); }); - test('allows to add another option', async function(assert) { + test('allows to add another option', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as // it's owner run(() => { - this.set('poll', this.store.createRecord('poll', { - options: [ - { title: '2015-01-01' }, - { title: '2015-02-02' } - ] - })); + this.set( + 'poll', + this.store.createRecord('poll', { + options: [{ title: '2015-01-01' }, { title: '2015-02-02' }], + }) + ); }); await render(hbs`{{create-options-datetime dates=poll.options}}`); @@ -147,24 +158,29 @@ module('Integration | Component | create options datetime', function(hooks) { 'new input has correct label' ); assert.ok( - findAll('.days .form-group')[1].querySelector('label').classList.contains('sr-only'), - 'label ofnew input is hidden cause it\'s repeated' + findAll('.days .form-group')[1] + .querySelector('label') + .classList.contains('sr-only'), + "label ofnew input is hidden cause it's repeated" ); }); - test('allows to delete an option', async function(assert) { + test('allows to delete an option', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as // it's owner run(() => { - this.set('poll', this.store.createRecord('poll', { - pollType: 'FindADate', - options: [ - { title: DateTime.fromISO('2015-01-01T11:11').toISO() }, - { title: DateTime.fromISO('2015-01-01T22:22').toISO() } - ] - })); + this.set( + 'poll', + this.store.createRecord('poll', { + pollType: 'FindADate', + options: [ + { title: DateTime.fromISO('2015-01-01T11:11').toISO() }, + { title: DateTime.fromISO('2015-01-01T22:22').toISO() }, + ], + }) + ); }); await render(hbs``); diff --git a/tests/integration/components/create-options-test.js b/tests/integration/components/create-options-test.js index 0e69f56..d4e568b 100644 --- a/tests/integration/components/create-options-test.js +++ b/tests/integration/components/create-options-test.js @@ -4,14 +4,14 @@ import { setupRenderingTest } from 'ember-qunit'; import { render, findAll, blur, fillIn, focus } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | create options', function(hooks) { +module('Integration | Component | create options', function (hooks) { setupRenderingTest(hooks); - hooks.beforeEach(function() { + hooks.beforeEach(function () { this.store = this.owner.lookup('service:store'); }); - test('shows validation errors if options are not unique (makeAPoll)', async function(assert) { + test('shows validation errors if options are not unique (makeAPoll)', async function (assert) { assert.expect(5); // validation is based on validation of every option fragment @@ -36,26 +36,34 @@ module('Integration | Component | create options', function(hooks) { /> `); - assert.dom('.form-group').exists({ count: 2 }, 'assumption: renders two form groups'); + assert + .dom('.form-group') + .exists({ count: 2 }, 'assumption: renders two form groups'); await fillIn('.form-group:nth-child(1) input', 'foo'); await blur('.form-group:nth-child(1) input'); await fillIn('.form-group:nth-child(2) input', 'foo'); await blur('.form-group:nth-child(2) input'); - assert.dom('.form-group:nth-child(2) input') + assert + .dom('.form-group:nth-child(2) input') .hasClass('is-invalid', 'second input field has validation error'); - assert.dom('.form-group:nth-child(2) .invalid-feedback') + assert + .dom('.form-group:nth-child(2) .invalid-feedback') .exists('validation error is shown'); await fillIn(findAll('input')[0], 'bar'); await blur(findAll('input')[0]); - assert.dom('.form-group .invalid-feedback') - .doesNotExist('there is no validation error anymore after a unique value is entered'); - assert.dom('.form-group .is-invalid') + assert + .dom('.form-group .invalid-feedback') + .doesNotExist( + 'there is no validation error anymore after a unique value is entered' + ); + assert + .dom('.form-group .is-invalid') .doesNotExist('.is-invalid classes are removed'); }); - test('shows validation errors if option is empty (makeAPoll)', async function(assert) { + test('shows validation errors if option is empty (makeAPoll)', async function (assert) { // validation is based on validation of every option fragment // which validates according to poll model it belongs to // therefore each option needs to be pushed to poll model to have it as @@ -78,9 +86,7 @@ module('Integration | Component | create options', function(hooks) { /> `); - assert.equal( - findAll('.form-group.has-error').length, 0 - ); + assert.equal(findAll('.form-group.has-error').length, 0); await focus(findAll('input')[0]); await blur(findAll('input')[0]); diff --git a/tests/integration/components/inline-datepicker-test.js b/tests/integration/components/inline-datepicker-test.js index 4221d86..9668c74 100644 --- a/tests/integration/components/inline-datepicker-test.js +++ b/tests/integration/components/inline-datepicker-test.js @@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | inline-datepicker', function(hooks) { +module('Integration | Component | inline-datepicker', function (hooks) { setupRenderingTest(hooks); - test('it renders an ember-power-calendar', async function(assert) { + test('it renders an ember-power-calendar', async function (assert) { this.set('noop', () => {}); await render(hbs`{{inline-datepicker onCenterChange=noop onSelect=noop}}`); diff --git a/tests/integration/components/next-button-test.js b/tests/integration/components/next-button-test.js index 3bab827..c7e4896 100644 --- a/tests/integration/components/next-button-test.js +++ b/tests/integration/components/next-button-test.js @@ -3,17 +3,17 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | next-button', function(hooks) { +module('Integration | Component | next-button', function (hooks) { setupRenderingTest(hooks); - test('it renders a button', async function(assert) { + test('it renders a button', async function (assert) { await render(hbs``); assert.dom('button').exists(); assert.dom('button').hasAttribute('type', 'submit'); }); - test('it renders a loading spinner if `@isPending` is `true`', async function(assert) { + test('it renders a loading spinner if `@isPending` is `true`', async function (assert) { await render(hbs``); assert.dom('button .spinner-border').exists(); diff --git a/tests/integration/components/save-button-test.js b/tests/integration/components/save-button-test.js index cda0017..d0f5455 100644 --- a/tests/integration/components/save-button-test.js +++ b/tests/integration/components/save-button-test.js @@ -3,17 +3,17 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | save-button', function(hooks) { +module('Integration | Component | save-button', function (hooks) { setupRenderingTest(hooks); - test('it renders a button', async function(assert) { + test('it renders a button', async function (assert) { await render(hbs``); assert.dom('button').exists(); assert.dom('button').hasAttribute('type', 'submit'); }); - test('it renders a loading spinner if `@isPending` is `true`', async function(assert) { + test('it renders a loading spinner if `@isPending` is `true`', async function (assert) { await render(hbs``); assert.dom('button .spinner-border').exists(); diff --git a/tests/integration/helpers/format-date-relative-test.js b/tests/integration/helpers/format-date-relative-test.js index 3c67eb9..962d268 100644 --- a/tests/integration/helpers/format-date-relative-test.js +++ b/tests/integration/helpers/format-date-relative-test.js @@ -4,10 +4,10 @@ import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { DateTime } from 'luxon'; -module('Integration | Helper | format-date-relative', function(hooks) { +module('Integration | Helper | format-date-relative', function (hooks) { setupRenderingTest(hooks); - test('it formats an ISO date to relative duration from now', async function(assert) { + test('it formats an ISO date to relative duration from now', async function (assert) { this.set('date', DateTime.local().plus({ hours: 6 })); await render(hbs`{{format-date-relative this.date}}`); @@ -35,7 +35,7 @@ module('Integration | Helper | format-date-relative', function(hooks) { assert.dom(this.element).hasText('in 1 year'); }); - test('it formats an ISO date to relative duration to now', async function(assert) { + test('it formats an ISO date to relative duration to now', async function (assert) { this.set('date', DateTime.local().minus({ hours: 6 })); await render(hbs`{{format-date-relative this.date}}`); diff --git a/tests/integration/helpers/mark-as-safe-html-test.js b/tests/integration/helpers/mark-as-safe-html-test.js index ee256d6..9735334 100644 --- a/tests/integration/helpers/mark-as-safe-html-test.js +++ b/tests/integration/helpers/mark-as-safe-html-test.js @@ -3,11 +3,11 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Helper | mark-as-safe-html', function(hooks) { +module('Integration | Helper | mark-as-safe-html', function (hooks) { setupRenderingTest(hooks); // Replace this with your real tests. - test('it renders', async function(assert) { + test('it renders', async function (assert) { this.set('inputValue', '1234'); await render(hbs`{{mark-as-safe-html "

    foo

    "}}`); diff --git a/tests/integration/helpers/scroll-first-invalid-element-into-view-port.js b/tests/integration/helpers/scroll-first-invalid-element-into-view-port.js index 0857c71..488cfa5 100644 --- a/tests/integration/helpers/scroll-first-invalid-element-into-view-port.js +++ b/tests/integration/helpers/scroll-first-invalid-element-into-view-port.js @@ -3,15 +3,18 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Helper | scroll-first-invalid-element-into-view-port', function(hooks) { - setupRenderingTest(hooks); +module( + 'Integration | Helper | scroll-first-invalid-element-into-view-port', + function (hooks) { + setupRenderingTest(hooks); - // Replace this with your real tests. - test('it renders', async function(assert) { - this.set('inputValue', '1234'); + // Replace this with your real tests. + test('it renders', async function (assert) { + this.set('inputValue', '1234'); - await render(hbs`{{scroll-element-into-view-port inputValue}}`); + await render(hbs`{{scroll-element-into-view-port inputValue}}`); - assert.equal(this.element.textContent.trim(), '1234'); - }); -}); + assert.equal(this.element.textContent.trim(), '1234'); + }); + } +); diff --git a/tests/integration/mirage-test.js b/tests/integration/mirage-test.js index 1f1c98d..3cb3e5f 100644 --- a/tests/integration/mirage-test.js +++ b/tests/integration/mirage-test.js @@ -1,34 +1,36 @@ -import { get } from '@ember/object'; import { module, test } from 'qunit'; import { startMirage } from 'croodle/initializers/ember-cli-mirage'; import sjcl from 'sjcl'; -module('Integration | Mirage api mocking', function(hooks) { - hooks.beforeEach(function() { +module('Integration | Mirage api mocking', function (hooks) { + hooks.beforeEach(function () { this.server = startMirage(); }); - hooks.afterEach(function() { + hooks.afterEach(function () { this.server.shutdown(); }); - test('poll factory | encrypts properties', function(assert) { + test('poll factory | encrypts properties', function (assert) { let encryptionKey = 'abc'; let poll = this.server.create('poll', { description: 'bar', encryptionKey, - title: 'foo' + title: 'foo', }); - assert.equal(JSON.parse(sjcl.decrypt(encryptionKey, get(poll, 'title'))), 'foo'); - assert.equal(JSON.parse(sjcl.decrypt(encryptionKey, get(poll, 'description'))), 'bar'); + assert.equal(JSON.parse(sjcl.decrypt(encryptionKey, poll.title)), 'foo'); + assert.equal( + JSON.parse(sjcl.decrypt(encryptionKey, poll.description)), + 'bar' + ); }); - test('user factory | encrypts properties', function(assert) { + test('user factory | encrypts properties', function (assert) { let encryptionKey = 'abc'; let user = this.server.create('user', { encryptionKey, - name: 'foo' + name: 'foo', }); - assert.equal(JSON.parse(sjcl.decrypt(encryptionKey, get(user, 'name'))), 'foo'); + assert.equal(JSON.parse(sjcl.decrypt(encryptionKey, user.name)), 'foo'); }); }); diff --git a/tests/integration/modifiers/autofocus-test.js b/tests/integration/modifiers/autofocus-test.js index a7223a8..61fe7e3 100644 --- a/tests/integration/modifiers/autofocus-test.js +++ b/tests/integration/modifiers/autofocus-test.js @@ -3,23 +3,23 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; -module('Integration | Modifier | autofocus', function(hooks) { +module('Integration | Modifier | autofocus', function (hooks) { setupRenderingTest(hooks); - test('it focuses the element', async function(assert) { + test('it focuses the element', async function (assert) { await render(hbs``); assert.dom('input').isFocused(); }); - test('it focuses the element if `enabled` is `true`', async function(assert) { + test('it focuses the element if `enabled` is `true`', async function (assert) { this.set('enabled', true); await render(hbs``); assert.dom('input').isFocused(); }); - test('it does not focus the element if `enabled` is `false`', async function(assert) { + test('it does not focus the element if `enabled` is `false`', async function (assert) { this.set('enabled', false); await render(hbs``); diff --git a/tests/integration/translations-test.js b/tests/integration/translations-test.js index a197548..e6bd086 100644 --- a/tests/integration/translations-test.js +++ b/tests/integration/translations-test.js @@ -2,14 +2,17 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; import localesMeta from 'croodle/locales/meta'; -module('Integration | translations', function(hooks) { +module('Integration | translations', function (hooks) { setupTest(hooks); - test('all locales have an entry in locales/meta', function(assert) { + test('all locales have an entry in locales/meta', function (assert) { let intl = this.owner.lookup('service:intl'); intl.locales.forEach((locale) => { - assert.ok(Object.keys(localesMeta).includes(locale), `locales meta data is present for ${locale}`); + assert.ok( + Object.keys(localesMeta).includes(locale), + `locales meta data is present for ${locale}` + ); }); }); }); diff --git a/tests/pages/create/index.js b/tests/pages/create/index.js index 2189d23..8e939ee 100644 --- a/tests/pages/create/index.js +++ b/tests/pages/create/index.js @@ -2,17 +2,14 @@ import PageObject from 'ember-cli-page-object'; import { defaultsForCreate } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; -const { - assign -} = Object; +const { assign } = Object; -const { - fillable, - visitable -} = PageObject; +const { fillable, visitable } = PageObject; -export default PageObject.create(assign({}, defaultsForCreate, { - pollType: fillable('.poll-type select'), - pollTypeHasFocus: hasFocus('.poll-type select'), - visit: visitable('/create') -})); +export default PageObject.create( + assign({}, defaultsForCreate, { + pollType: fillable('.poll-type select'), + pollTypeHasFocus: hasFocus('.poll-type select'), + visit: visitable('/create'), + }) +); diff --git a/tests/pages/create/meta.js b/tests/pages/create/meta.js index 4e5bf6c..003c4e2 100644 --- a/tests/pages/create/meta.js +++ b/tests/pages/create/meta.js @@ -2,16 +2,14 @@ import PageObject from 'ember-cli-page-object'; import { defaultsForCreate } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; -const { - assign -} = Object; +const { assign } = Object; -let { - fillable -} = PageObject; +let { fillable } = PageObject; -export default PageObject.create(assign({}, defaultsForCreate, { - description: fillable('.description textarea'), - title: fillable('.title input'), - titleHasFocus: hasFocus('.title input') -})); +export default PageObject.create( + assign({}, defaultsForCreate, { + description: fillable('.description textarea'), + title: fillable('.title input'), + titleHasFocus: hasFocus('.title input'), + }) +); diff --git a/tests/pages/create/options-datetime.js b/tests/pages/create/options-datetime.js index 9b2fe8b..170beeb 100644 --- a/tests/pages/create/options-datetime.js +++ b/tests/pages/create/options-datetime.js @@ -2,36 +2,30 @@ import PageObject from 'ember-cli-page-object'; import { defaultsForCreate } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; -const { - assign -} = Object; +const { assign } = Object; -let { - clickable, - collection, - fillable, - hasClass, - text -} = PageObject; +let { clickable, collection, fillable, hasClass, text } = PageObject; -export default PageObject.create(assign({}, defaultsForCreate, { - days: collection({ - itemScope: '.form-group', - labels: text('label:not(.sr-only)', { multiple: true }) - }), - times: collection({ - itemScope: '.form-group', - item: { - add: clickable('button.add'), - delete: clickable('button.delete'), - label: text('label'), - labelIsHidden: hasClass('label', 'sr-only'), - time: fillable('input') - } - }), - firstTime: { - scope: '.form-group:first', +export default PageObject.create( + assign({}, defaultsForCreate, { + days: collection({ + itemScope: '.form-group', + labels: text('label:not(.sr-only)', { multiple: true }), + }), + times: collection({ + itemScope: '.form-group', + item: { + add: clickable('button.add'), + delete: clickable('button.delete'), + label: text('label'), + labelIsHidden: hasClass('label', 'sr-only'), + time: fillable('input'), + }, + }), + firstTime: { + scope: '.form-group:first', - inputHasFocus: hasFocus('input') - } -})); + inputHasFocus: hasFocus('input'), + }, + }) +); diff --git a/tests/pages/create/options.js b/tests/pages/create/options.js index fcfccbd..669b55e 100644 --- a/tests/pages/create/options.js +++ b/tests/pages/create/options.js @@ -5,7 +5,7 @@ import { fillable, hasClass, isVisible, - text + text, } from 'ember-cli-page-object'; import { defaultsForCreate } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; @@ -21,35 +21,44 @@ function selectDates(selector) { async value(dateOrDateTimes) { assert( 'selectDates expects an array of date or DateTime (luxon) objects as frist argument', - isArray(dateOrDateTimes) && dateOrDateTimes.every((dateOrDateTime) => dateOrDateTime instanceof Date || DateTime.isDateTime(dateOrDateTime)) - ) + isArray(dateOrDateTimes) && + dateOrDateTimes.every( + (dateOrDateTime) => + dateOrDateTime instanceof Date || + DateTime.isDateTime(dateOrDateTime) + ) + ); for (let i = 0; i < dateOrDateTimes.length; i++) { let dateOrDateTime = dateOrDateTimes[i]; - let date = DateTime.isDateTime(dateOrDateTime) ? dateOrDateTime.toJSDate() : dateOrDateTime; + let date = DateTime.isDateTime(dateOrDateTime) + ? dateOrDateTime.toJSDate() + : dateOrDateTime; await calendarSelect(selector, date); } - } + }, }; } -export default create(assign({}, defaultsForCreate, { - selectDates: selectDates('[data-test-form-element-for="days"]'), - dateHasError: isVisible('.days.has-error'), - dateError: text('.days .help-block'), +export default create( + assign({}, defaultsForCreate, { + selectDates: selectDates('[data-test-form-element-for="days"]'), + dateHasError: isVisible('.days.has-error'), + dateError: text('.days .help-block'), - textOptions: collection({ - itemScope: '.form-group.option', - item: { - add: clickable('button.add'), - delete: clickable('button.delete'), - hasError: hasClass('is-invalid', 'input'), - title: fillable('input') - } - }), - firstTextOption: { - scope: '.form-group.option:first', + textOptions: collection({ + itemScope: '.form-group.option', + item: { + add: clickable('button.add'), + delete: clickable('button.delete'), + hasError: hasClass('is-invalid', 'input'), + title: fillable('input'), + }, + }), + firstTextOption: { + scope: '.form-group.option:first', - inputHasFocus: hasFocus('input') - } -})); + inputHasFocus: hasFocus('input'), + }, + }) +); diff --git a/tests/pages/create/settings.js b/tests/pages/create/settings.js index f3e0204..b57d704 100644 --- a/tests/pages/create/settings.js +++ b/tests/pages/create/settings.js @@ -2,18 +2,15 @@ import PageObject from 'ember-cli-page-object'; import { defaultsForCreate } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; -const { - assign -} = Object; +const { assign } = Object; -const { - fillable, - visitable -} = PageObject; +const { fillable, visitable } = PageObject; -export default PageObject.create(assign({}, defaultsForCreate, { - availableAnswers: fillable('.answer-type select'), - availableAnswersHasFocus: hasFocus('.answer-type select'), - save: defaultsForCreate.next, - visit: visitable('/create/settings') -})); +export default PageObject.create( + assign({}, defaultsForCreate, { + availableAnswers: fillable('.answer-type select'), + availableAnswersHasFocus: hasFocus('.answer-type select'), + save: defaultsForCreate.next, + visit: visitable('/create/settings'), + }) +); diff --git a/tests/pages/defaults.js b/tests/pages/defaults.js index b73e0b0..922bd0f 100644 --- a/tests/pages/defaults.js +++ b/tests/pages/defaults.js @@ -1,12 +1,6 @@ import PageObject from 'ember-cli-page-object'; -const { - clickable, - collection, - fillable, - property, - text -} = PageObject; +const { clickable, collection, fillable, property, text } = PageObject; const { assign } = Object; @@ -14,7 +8,7 @@ const { assign } = Object; * shared features between all pages */ export const defaultsForApplication = { - locale: fillable('.language-select') + locale: fillable('.language-select'), }; /* @@ -28,7 +22,7 @@ export const defaultsForCreate = assign({}, defaultsForApplication, { itemScope: '.form-steps button', item: { isDisabled: property('disabled'), - text: text() - } - }) + text: text(), + }, + }), }); diff --git a/tests/pages/helpers.js b/tests/pages/helpers.js index 7135742..e6b2839 100644 --- a/tests/pages/helpers.js +++ b/tests/pages/helpers.js @@ -5,9 +5,9 @@ export function hasFocus(selector, options = {}) { isDescriptor: true, get() { - let [ el ] = findElementWithAssert(this, selector, options); + let [el] = findElementWithAssert(this, selector, options); let document = el.ownerDocument; return el === document.activeElement; - } + }, }; } diff --git a/tests/pages/poll.js b/tests/pages/poll.js index 3d9af9f..2db45dc 100644 --- a/tests/pages/poll.js +++ b/tests/pages/poll.js @@ -1,12 +1,8 @@ -import { - create, - isVisible, - text -} from 'ember-cli-page-object'; +import { create, isVisible, text } from 'ember-cli-page-object'; import { currentURL } from '@ember/test-helpers'; -const urlMatches = function(regExp) { - return function() { +const urlMatches = function (regExp) { + return function () { return regExp.test(currentURL()); }; }; @@ -14,7 +10,9 @@ const urlMatches = function(regExp) { export const definition = { showsExpirationWarning: isVisible('.expiration-warning'), url: text('.poll-link .link code'), - urlIsValid: urlMatches(/^\/poll\/[a-zA-Z0-9]{10}\/participation\?encryptionKey=[a-zA-Z0-9]{40}$/) + urlIsValid: urlMatches( + /^\/poll\/[a-zA-Z0-9]{10}\/participation\?encryptionKey=[a-zA-Z0-9]{40}$/ + ), }; export default create(definition); diff --git a/tests/pages/poll/evaluation.js b/tests/pages/poll/evaluation.js index db1e66b..659e44c 100644 --- a/tests/pages/poll/evaluation.js +++ b/tests/pages/poll/evaluation.js @@ -1,23 +1,28 @@ -import { - attribute, - collection, - create, - text, -} from 'ember-cli-page-object'; +import { attribute, collection, create, text } from 'ember-cli-page-object'; import { definition as Poll } from 'croodle/tests/pages/poll'; import { defaultsForApplication } from 'croodle/tests/pages/defaults'; import { assign } from '@ember/polyfills'; -export default create(assign({}, defaultsForApplication, Poll, { - options: collection('[data-test-table-of="participants"] thead tr:last-child th:not(:first-child)', { - label: text(''), - }), - preferedOptions: text('.best-options .best-option-value', { multiple: true }), - participants: collection('[data-test-table-of="participants"] [data-test-participant]', { - name: text('[data-test-value-for="name"]'), - selections: collection('[data-test-is-selection-cell]', { - answer: text(''), - option: attribute('data-test-value-for', ''), +export default create( + assign({}, defaultsForApplication, Poll, { + options: collection( + '[data-test-table-of="participants"] thead tr:last-child th:not(:first-child)', + { + label: text(''), + } + ), + preferedOptions: text('.best-options .best-option-value', { + multiple: true, }), - }), -})); + participants: collection( + '[data-test-table-of="participants"] [data-test-participant]', + { + name: text('[data-test-value-for="name"]'), + selections: collection('[data-test-is-selection-cell]', { + answer: text(''), + option: attribute('data-test-value-for', ''), + }), + } + ), + }) +); diff --git a/tests/pages/poll/participation.js b/tests/pages/poll/participation.js index b048c9c..9dfd464 100644 --- a/tests/pages/poll/participation.js +++ b/tests/pages/poll/participation.js @@ -3,28 +3,25 @@ import { definition as Poll } from 'croodle/tests/pages/poll'; import { defaultsForApplication } from 'croodle/tests/pages/defaults'; import { hasFocus } from 'croodle/tests/pages/helpers'; -let { - collection, - fillable, - text, - visitable -} = PageObject; +let { collection, fillable, text, visitable } = PageObject; const { assign } = Object; -export default PageObject.create(assign({}, defaultsForApplication, Poll, { - description: text('.description'), - name: fillable('.name input'), - nameHasFocus: hasFocus('.name input'), - options: collection({ - answers: text('.selections .form-group:eq(0) .radio', { multiple: true }), - itemScope: '.selections .form-group', - item: { - label: text('label') - }, - labels: text('.selections .form-group > label', { multiple: true }) - }), - title: text('h2.title'), - // use as .visit({ encryptionKey: ??? }) - visit: visitable('/poll/participation') -})); +export default PageObject.create( + assign({}, defaultsForApplication, Poll, { + description: text('.description'), + name: fillable('.name input'), + nameHasFocus: hasFocus('.name input'), + options: collection({ + answers: text('.selections .form-group:eq(0) .radio', { multiple: true }), + itemScope: '.selections .form-group', + item: { + label: text('label'), + }, + labels: text('.selections .form-group > label', { multiple: true }), + }), + title: text('h2.title'), + // use as .visit({ encryptionKey: ??? }) + visit: visitable('/poll/participation'), + }) +); diff --git a/tests/test-helper.js b/tests/test-helper.js index e5e3d49..efb731c 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,16 +1,23 @@ import Application from 'croodle/app'; import config from 'croodle/config/environment'; +import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; +import { setup } from 'qunit-dom'; import { start } from 'ember-qunit'; -document.addEventListener('securitypolicyviolation', function({ blockedURI, violatedDirective }) { - throw new Error( - 'Content-Security-Policy violation detected: ' + - `Violated directive: ${violatedDirective}. ` + - `Blocked URI: ${blockedURI}` - ); -}); +document.addEventListener( + 'securitypolicyviolation', + function ({ blockedURI, violatedDirective }) { + throw new Error( + 'Content-Security-Policy violation detected: ' + + `Violated directive: ${violatedDirective}. ` + + `Blocked URI: ${blockedURI}` + ); + } +); setApplication(Application.create(config.APP)); +setup(QUnit.assert); + start(); diff --git a/tests/unit/controllers/poll-error-test.js b/tests/unit/controllers/poll-error-test.js index 746ae50..c1e941e 100644 --- a/tests/unit/controllers/poll-error-test.js +++ b/tests/unit/controllers/poll-error-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Controller | poll-error', function(hooks) { +module('Unit | Controller | poll-error', function (hooks) { setupTest(hooks); // Replace this with your real tests. - test('it exists', function(assert) { + test('it exists', function (assert) { let controller = this.owner.lookup('controller:poll-error'); assert.ok(controller); }); diff --git a/tests/unit/controllers/poll-test.js b/tests/unit/controllers/poll-test.js index 14cede3..0483e97 100644 --- a/tests/unit/controllers/poll-test.js +++ b/tests/unit/controllers/poll-test.js @@ -2,27 +2,33 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; import { DateTime } from 'luxon'; -module('Unit | Controller | poll', function(hooks) { +module('Unit | Controller | poll', function (hooks) { setupTest(hooks); - test('#showExpirationWarning', function(assert) { + test('#showExpirationWarning', function (assert) { let controller = this.owner.factoryFor('controller:poll').create({ model: { - expirationDate: undefined - } + expirationDate: undefined, + }, }); assert.notOk( controller.get('showExpirationWarning'), 'is false if expirationDate is undefined' ); - controller.set('model.expirationDate', DateTime.local().plus({ weeks: 1 }).toISO()); + controller.set( + 'model.expirationDate', + DateTime.local().plus({ weeks: 1 }).toISO() + ); assert.ok( controller.get('showExpirationWarning'), 'is true if expirationDate is less than 2 weeks in future' ); - controller.set('model.expirationDate', DateTime.local().plus({ months: 1 }).toISO()); + controller.set( + 'model.expirationDate', + DateTime.local().plus({ months: 1 }).toISO() + ); assert.notOk( controller.get('showExpirationWarning'), 'is false if expirationDate is more than 2 weeks in future' diff --git a/tests/unit/controllers/poll/participation-test.js b/tests/unit/controllers/poll/participation-test.js index e7d3d32..c49441a 100644 --- a/tests/unit/controllers/poll/participation-test.js +++ b/tests/unit/controllers/poll/participation-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Controller | poll/participation', function(hooks) { +module('Unit | Controller | poll/participation', function (hooks) { setupTest(hooks); // Replace this with your real tests. - test('it exists', function(assert) { + test('it exists', function (assert) { let controller = this.owner.lookup('controller:poll/participation'); assert.ok(controller); }); diff --git a/tests/unit/models/option-test.js b/tests/unit/models/option-test.js index ca5439b..ad5ec59 100644 --- a/tests/unit/models/option-test.js +++ b/tests/unit/models/option-test.js @@ -4,14 +4,16 @@ import { setupTest } from 'ember-qunit'; import { setupIntl } from 'ember-intl/test-support'; import { DateTime } from 'luxon'; -module('Unit | Model | option', function(hooks) { +module('Unit | Model | option', function (hooks) { setupTest(hooks); setupIntl(hooks, 'en'); - test('day property (get)', function(assert) { - let option = run(() => this.owner.lookup('service:store').createRecord('option', { - title: '2015-01-01' - })); + test('day property (get)', function (assert) { + let option = run(() => + this.owner.lookup('service:store').createRecord('option', { + title: '2015-01-01', + }) + ); assert.equal( option.get('day'), '2015-01-01', @@ -46,10 +48,12 @@ module('Unit | Model | option', function(hooks) { ); }); - test('hasTime property', function(assert) { - let option = run(() => this.owner.lookup('service:store').createRecord('option', { - title: '2015-01-01T11:11:00.000Z' - })); + test('hasTime property', function (assert) { + let option = run(() => + this.owner.lookup('service:store').createRecord('option', { + title: '2015-01-01T11:11:00.000Z', + }) + ); assert.ok(option.get('hasTime')); run(() => { option.set('title', '2015-01-01'); @@ -61,10 +65,12 @@ module('Unit | Model | option', function(hooks) { assert.notOk(option.get('hasTime')); }); - test('time property (get)', function(assert) { - let option = run(() => this.owner.lookup('service:store').createRecord('option', { - title: '2015-01-01T11:11:00.000Z' - })); + test('time property (get)', function (assert) { + let option = run(() => + this.owner.lookup('service:store').createRecord('option', { + title: '2015-01-01T11:11:00.000Z', + }) + ); assert.equal( option.get('time'), DateTime.fromISO('2015-01-01T11:11:00.000Z').toFormat('HH:mm'), @@ -90,10 +96,12 @@ module('Unit | Model | option', function(hooks) { ); }); - test('time property (set)', function(assert) { - let option = run(() => this.owner.lookup('service:store').createRecord('option', { - title: '2015-01-01' - })); + test('time property (set)', function (assert) { + let option = run(() => + this.owner.lookup('service:store').createRecord('option', { + title: '2015-01-01', + }) + ); run(() => { option.set('time', '11:00'); @@ -126,11 +134,8 @@ module('Unit | Model | option', function(hooks) { run(() => { option.set('title', 'abc'); }); - assert.throws( - () => { - option.set('time', '11:11'); - }, - 'throws if attempt to set a time if title is not a date string' - ); + assert.throws(() => { + option.set('time', '11:11'); + }, 'throws if attempt to set a time if title is not a date string'); }); }); diff --git a/tests/unit/models/poll-test.js b/tests/unit/models/poll-test.js index ca62ed8..ba9e032 100644 --- a/tests/unit/models/poll-test.js +++ b/tests/unit/models/poll-test.js @@ -1,10 +1,10 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Model | poll', function(hooks) { +module('Unit | Model | poll', function (hooks) { setupTest(hooks); - test('#hasTimes: true if all options have times', function(assert) { + test('#hasTimes: true if all options have times', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { pollType: 'FindADate', @@ -17,43 +17,34 @@ module('Unit | Model | poll', function(hooks) { assert.ok(poll.hasTimes); }); - test('#hasTimes: true if at least one option has times', function(assert) { + test('#hasTimes: true if at least one option has times', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { - options: [ - { title: '2019-01-01T00:00:00.000Z' }, - { title: '2019-01-02' }, - ], + options: [{ title: '2019-01-01T00:00:00.000Z' }, { title: '2019-01-02' }], pollType: 'FindADate', }); assert.ok(poll.hasTimes); }); - test('#hasTimes: false if no option has times', function(assert) { + test('#hasTimes: false if no option has times', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { - options: [ - { title: '2019-01-01' }, - { title: '2019-01-02' }, - ], + options: [{ title: '2019-01-01' }, { title: '2019-01-02' }], pollType: 'FindADate', }); assert.notOk(poll.hasTimes); }); - test('#hasTimes: false if poll is not FindADate', function(assert) { + test('#hasTimes: false if poll is not FindADate', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { - options: [ - { title: 'abc' }, - { title: 'def' }, - ], + options: [{ title: 'abc' }, { title: 'def' }], pollType: 'MakeAPoll', }); assert.notOk(poll.hasTimes); }); - test('#isFindADate', function(assert) { + test('#isFindADate', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { pollType: 'FindADate', @@ -63,7 +54,7 @@ module('Unit | Model | poll', function(hooks) { assert.notOk(poll.isMakeAPoll); }); - test('#isFreeText', function(assert) { + test('#isFreeText', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { answerType: 'FreeText', @@ -78,7 +69,7 @@ module('Unit | Model | poll', function(hooks) { assert.notOk(poll.isFreeText); }); - test('#isMakeAPoll', function(assert) { + test('#isMakeAPoll', function (assert) { let store = this.owner.lookup('service:store'); let poll = store.createRecord('poll', { pollType: 'MakeAPoll', diff --git a/tests/unit/routes/create/options-datetime-test.js b/tests/unit/routes/create/options-datetime-test.js index e841705..5888a2f 100644 --- a/tests/unit/routes/create/options-datetime-test.js +++ b/tests/unit/routes/create/options-datetime-test.js @@ -1,10 +1,10 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Route | create/options datetime', function(hooks) { +module('Unit | Route | create/options datetime', function (hooks) { setupTest(hooks); - test('it exists', function(assert) { + test('it exists', function (assert) { let route = this.owner.lookup('route:create/options-datetime'); assert.ok(route); }); diff --git a/tests/unit/routes/poll/evaluation-test.js b/tests/unit/routes/poll/evaluation-test.js index 817af8f..8203486 100644 --- a/tests/unit/routes/poll/evaluation-test.js +++ b/tests/unit/routes/poll/evaluation-test.js @@ -1,10 +1,10 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Route | poll/evaluation', function(hooks) { +module('Unit | Route | poll/evaluation', function (hooks) { setupTest(hooks); - test('it exists', function(assert) { + test('it exists', function (assert) { let route = this.owner.lookup('route:poll/evaluation'); assert.ok(route); }); diff --git a/tests/unit/routes/poll/participation-test.js b/tests/unit/routes/poll/participation-test.js index f293e55..76c8592 100644 --- a/tests/unit/routes/poll/participation-test.js +++ b/tests/unit/routes/poll/participation-test.js @@ -1,10 +1,10 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Route | poll/participation', function(hooks) { +module('Unit | Route | poll/participation', function (hooks) { setupTest(hooks); - test('it exists', function(assert) { + test('it exists', function (assert) { let route = this.owner.lookup('route:poll/participation'); assert.ok(route); }); diff --git a/tests/unit/services/encryption-test.js b/tests/unit/services/encryption-test.js index c8d681b..103a65f 100644 --- a/tests/unit/services/encryption-test.js +++ b/tests/unit/services/encryption-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Service | encryption', function(hooks) { +module('Unit | Service | encryption', function (hooks) { setupTest(hooks); // Replace this with your real tests. - test('it exists', function(assert) { + test('it exists', function (assert) { let service = this.owner.lookup('service:encryption'); assert.ok(service); }); diff --git a/yarn.lock b/yarn.lock index aa811c5..02bcdd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,7 +80,7 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6": +"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== @@ -293,7 +293,7 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7", "@babel/plugin-proposal-decorators@^7.20.13": +"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz#0b345a5754f48309fa50b7cd99075ef0295b12c8" integrity sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg== @@ -317,7 +317,7 @@ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== -"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.20.5": +"@babel/plugin-proposal-private-property-in-object@^7.16.5": version "7.21.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c" integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw== @@ -640,7 +640,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.23.0": +"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88" integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw== @@ -844,7 +844,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.20.13": +"@babel/plugin-transform-typescript@^7.13.0": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz#15adef906451d86349eb4b8764865c960eb54127" integrity sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA== @@ -910,7 +910,7 @@ core-js "^2.6.5" regenerator-runtime "^0.13.4" -"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7", "@babel/preset-env@^7.20.2": +"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059" integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ== @@ -1017,7 +1017,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.8.4": +"@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== @@ -1257,6 +1257,16 @@ dependencies: "@ember-intl/intl-messageformat" "^2.0.0" +"@ember-template-lint/todo-utils@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@ember-template-lint/todo-utils/-/todo-utils-10.0.0.tgz#085aafcf31ca04ba4d3a9460f088aed752b90ea8" + integrity sha512-US8VKnetBOl8KfKz+rXGsosz6rIETNwSz2F2frM8hIoJfF/d6ME1Iz1K7tPYZEE6SoKqZFlBs5XZPSmzRnabjA== + dependencies: + "@types/eslint" "^7.2.13" + fs-extra "^9.1.0" + slash "^3.0.0" + tslib "^2.2.0" + "@ember/edition-utils@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6" @@ -1298,17 +1308,29 @@ dependencies: ember-cli-babel "^7.26.6" -"@ember/test-helpers@^1.7.1": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.3.tgz#d06b36cb579b172186b11b236b90f0a1aba15ab0" - integrity sha512-0NwxM9rtl/vD/Zqv8cHefLxojL3l2xuRs6pEppff/Fe39ybXz5H7hm5ZvnpRO/lpSsIeX7tivht9ko6/V+sShw== +"@ember/test-helpers@^2.6.0": + version "2.9.4" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.4.tgz#985022e9ba05cfc918bcf08b77cbb355f85b723e" + integrity sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA== dependencies: + "@ember/test-waiters" "^3.0.0" + "@embroider/macros" "^1.10.0" + "@embroider/util" "^1.9.0" broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" - ember-assign-polyfill "^2.6.0" - ember-cli-babel "^7.26.2" - ember-cli-htmlbars-inline-precompile "^2.1.0" - ember-test-waiters "^1.1.1" + broccoli-funnel "^3.0.8" + ember-cli-babel "^7.26.11" + ember-cli-htmlbars "^6.1.1" + ember-destroyable-polyfill "^2.0.3" + +"@ember/test-waiters@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f" + integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ== + dependencies: + calculate-cache-key-for-tree "^2.0.0" + ember-cli-babel "^7.26.6" + ember-cli-version-checker "^5.1.2" + semver "^7.3.5" "@embroider/addon-shim@1.8.3": version "1.8.3" @@ -1339,7 +1361,7 @@ resolve "^1.8.1" semver "^7.3.2" -"@embroider/macros@^1.0.0", "@embroider/macros@^1.13.0", "@embroider/macros@^1.13.1": +"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.0", "@embroider/macros@^1.13.1": version "1.13.2" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.2.tgz#07dda11313a2539f403404881b729e622a80ca17" integrity sha512-AUgJ71xG8kjuTx8XB1AQNBiebJuXRfhcHr318dCwnQz9VRXdYSnEEqf38XRvGYIoCvIyn/3c72LrSwzaJqknOA== @@ -1395,7 +1417,7 @@ semver "^7.3.5" typescript-memoize "^1.0.1" -"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0", "@embroider/util@^1.0.0": +"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0", "@embroider/util@^1.0.0", "@embroider/util@^1.9.0": version "1.12.0" resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.12.0.tgz#4b7828650b55f8498f1e78bb63e27e77835e926f" integrity sha512-P4M1QADEH9ceIYC9mwHeV+6DDgEIQQYFfZi728nVKqTAxakXoiLgu/BCyQmEGyow9fYEPYaC1boDCZxW2JQAXg== @@ -1424,7 +1446,7 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@glimmer/component@^1.0.1", "@glimmer/component@^1.0.4": +"@glimmer/component@^1.0.4": version "1.1.2" resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c" integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A== @@ -1506,7 +1528,7 @@ "@handlebars/parser" "~2.0.0" simple-html-tokenizer "^0.5.11" -"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.4", "@glimmer/tracking@^1.1.2": +"@glimmer/tracking@^1.0.4", "@glimmer/tracking@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb" integrity sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA== @@ -1933,6 +1955,14 @@ "@types/estree" "*" "@types/json-schema" "*" +"@types/eslint@^7.2.13": + version "7.29.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" + integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + "@types/estree@*", "@types/estree@^1.0.0": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.2.tgz#ff02bc3dc8317cd668dfec247b750ba1f1d62453" @@ -3150,11 +3180,6 @@ babel-plugin-filter-imports@^4.0.0: "@babel/types" "^7.7.2" lodash "^4.17.15" -babel-plugin-htmlbars-inline-precompile@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22" - integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ== - babel-plugin-htmlbars-inline-precompile@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606" @@ -3193,17 +3218,6 @@ babel-plugin-module-resolver@^4.1.0: reselect "^4.0.0" resolve "^1.13.1" -babel-plugin-module-resolver@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73" - integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q== - dependencies: - find-babel-config "^2.0.0" - glob "^8.0.3" - pkg-up "^3.1.0" - reselect "^4.1.7" - resolve "^1.22.1" - babel-plugin-polyfill-corejs2@^0.4.6: version "0.4.6" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" @@ -3802,13 +3816,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -3893,20 +3900,6 @@ broccoli-babel-transpiler@^7.8.0: rsvp "^4.8.4" workerpool "^3.1.1" -broccoli-babel-transpiler@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-8.0.0.tgz#07576728a95b840a99d5f0f9b07b71a737f69319" - integrity sha512-3HEp3flvasUKJGWERcrPgM1SWvHJ0O/fmbEtY9L4kDyMSnqjY6hTYvNvgWCIgbwXAYAUlZP0vjAQsmyLNGLwFw== - dependencies: - broccoli-persistent-filter "^3.0.0" - clone "^2.1.2" - hash-for-dep "^1.4.7" - heimdalljs "^0.2.1" - heimdalljs-logger "^0.1.9" - json-stable-stringify "^1.0.1" - rsvp "^4.8.4" - workerpool "^6.0.2" - broccoli-builder@^0.18.14: version "0.18.14" resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d" @@ -4241,7 +4234,7 @@ broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.0, broccoli-p sync-disk-cache "^1.3.3" walk-sync "^1.0.0" -broccoli-persistent-filter@^3.0.0, broccoli-persistent-filter@^3.1.2: +broccoli-persistent-filter@^3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz#aca815bf3e3b0247bd0a7b567fdb0d0e08c99cc2" integrity sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw== @@ -4372,7 +4365,7 @@ broccoli-source@^2.1.2: resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b" integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ== -broccoli-source@^3.0.0, broccoli-source@^3.0.1: +broccoli-source@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.1.tgz#fd581b2f3877ca1338f724f6ef70acec8c7e1444" integrity sha512-ZbGVQjivWi0k220fEeIUioN6Y68xjMy0xiLAc0LdieHI99gw+tafU8w0CggBDYVNsJMKUr006AZaM7gNEwCxEg== @@ -4421,22 +4414,21 @@ broccoli-templater@^2.0.1: rimraf "^2.6.2" walk-sync "^0.3.3" -broccoli-uglify-sourcemap@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c" - integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g== +broccoli-terser-sourcemap@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115" + integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw== dependencies: async-promise-queue "^1.0.5" - broccoli-plugin "^1.2.1" + broccoli-plugin "^4.0.3" debug "^4.1.0" lodash.defaultsdeep "^4.6.1" - matcher-collection "^2.0.0" - mkdirp "^0.5.0" + matcher-collection "^2.0.1" source-map-url "^0.4.0" - symlink-or-copy "^1.0.1" - terser "^4.3.9" - walk-sync "^1.1.3" - workerpool "^5.0.1" + symlink-or-copy "^1.3.1" + terser "^5.3.0" + walk-sync "^2.2.0" + workerpool "^6.0.0" broccoli@^3.5.1: version "3.5.2" @@ -4869,7 +4861,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4948,7 +4940,7 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.2.0: +ci-info@^3.2.0, ci-info@^3.3.0: version "3.9.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== @@ -5222,7 +5214,7 @@ commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -common-tags@^1.4.0, common-tags@^1.8.0: +common-tags@^1.8.0: version "1.8.2" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== @@ -5548,6 +5540,14 @@ css-loader@^5.2.0: schema-utils "^3.0.0" semver "^7.3.5" +css-tree@^2.0.4: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -5573,6 +5573,13 @@ data-uri-to-buffer@^6.0.0: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz#540bd4c8753a25ee129035aebdedf63b078703c7" integrity sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg== +date-fns@^2.28.0: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" + date-time@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2" @@ -5903,14 +5910,6 @@ ember-assign-helper@^0.4.0: ember-cli-babel "^7.26.0" ember-cli-htmlbars "^6.0.0" -ember-assign-polyfill@^2.6.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.7.3.tgz#bfd7b5041061753a2af3865ca8456868debe041d" - integrity sha512-PINAtHOQf5DKniyecOBZSz8VZVmtIKFvp67853+aw+TL+LWUCji5OjQ13PrAV/GIl3Fp2sZ7IbEPyTobDL7Y8Q== - dependencies: - ember-cli-babel ">= 6.17.2" - ember-cli-version-checker "^2.0.0" - ember-auto-import@^1.11.3, ember-auto-import@^1.12.0, ember-auto-import@^1.5.2: version "1.12.2" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.2.tgz#cc7298ee5c0654b0249267de68fb27a2861c3579" @@ -6081,40 +6080,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== -"ember-cli-babel@>= 6.17.2": - version "8.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-8.2.0.tgz#91e14c22ac22956177002385947724174553d41c" - integrity sha512-8H4+jQElCDo6tA7CamksE66NqBXWs7VNpS3a738L9pZCjg2kXIX4zoyHzkORUqCtr0Au7YsCnrlAMi1v2ALo7A== - dependencies: - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/plugin-proposal-class-properties" "^7.16.5" - "@babel/plugin-proposal-decorators" "^7.20.13" - "@babel/plugin-proposal-private-methods" "^7.16.5" - "@babel/plugin-proposal-private-property-in-object" "^7.20.5" - "@babel/plugin-transform-class-static-block" "^7.22.11" - "@babel/plugin-transform-modules-amd" "^7.20.11" - "@babel/plugin-transform-runtime" "^7.13.9" - "@babel/plugin-transform-typescript" "^7.20.13" - "@babel/preset-env" "^7.20.2" - "@babel/runtime" "7.12.18" - amd-name-resolver "^1.3.1" - babel-plugin-debug-macros "^0.3.4" - babel-plugin-ember-data-packages-polyfill "^0.1.2" - babel-plugin-ember-modules-api-polyfill "^3.5.0" - babel-plugin-module-resolver "^5.0.0" - broccoli-babel-transpiler "^8.0.0" - broccoli-debug "^0.6.4" - broccoli-funnel "^3.0.8" - broccoli-source "^3.0.1" - calculate-cache-key-for-tree "^2.0.0" - clone "^2.1.2" - ember-cli-babel-plugin-helpers "^1.1.1" - ember-cli-version-checker "^5.1.2" - ensure-posix-path "^1.0.2" - resolve-package-path "^4.0.3" - semver "^7.3.8" - -ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1: +ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0: version "6.18.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957" integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA== @@ -6133,7 +6099,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3: version "7.26.11" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f" integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA== @@ -6267,17 +6233,6 @@ ember-cli-get-component-path-option@^1.0.0: resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771" integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA== -ember-cli-htmlbars-inline-precompile@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08" - integrity sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q== - dependencies: - babel-plugin-htmlbars-inline-precompile "^1.0.0" - ember-cli-version-checker "^2.1.2" - hash-for-dep "^1.2.3" - heimdalljs-logger "^0.1.9" - silent-error "^1.1.0" - ember-cli-htmlbars@^4.2.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e" @@ -6298,7 +6253,7 @@ ember-cli-htmlbars@^4.2.0: strip-bom "^4.0.0" walk-sync "^2.0.2" -ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1: +ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1, ember-cli-htmlbars@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8" integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg== @@ -6320,7 +6275,7 @@ ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, strip-bom "^4.0.0" walk-sync "^2.2.0" -ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.2.0, ember-cli-htmlbars@^6.3.0: +ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0, ember-cli-htmlbars@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz#ac85f2bbd09788992ab7f9ca832cd044fb8e5798" integrity sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag== @@ -6340,7 +6295,7 @@ ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.2.0, silent-error "^1.1.1" walk-sync "^2.2.0" -ember-cli-inject-live-reload@^2.0.2: +ember-cli-inject-live-reload@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385" integrity sha512-YV5wYRD5PJHmxaxaJt18u6LE6Y+wo455BnmcpN+hGNlChy2piM9/GMvYgTAz/8Vin8RJ5KekqP/w/NEaRndc/A== @@ -6445,6 +6400,13 @@ ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0: resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" integrity sha512-PlJt4fUDyBrC/0X+4cOpaGCiMawaaB//qD85AXmDRikxhxVzfVdpuoec02HSiTGTTB85qCIzWBIh8lDOiMyyFg== +ember-cli-terser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.2.tgz#c436a9e4159f76a615b051cba0584844652b7dcd" + integrity sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA== + dependencies: + broccoli-terser-sourcemap "^4.1.0" + ember-cli-test-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4" @@ -6452,12 +6414,12 @@ ember-cli-test-info@^1.0.0: dependencies: ember-cli-string-utils "^1.0.0" -ember-cli-test-loader@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243" - integrity sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA== +ember-cli-test-loader@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.1.0.tgz#13abd43b7e07e2266a9f0fc5b9dc5455883b18ff" + integrity sha512-0aocZV9SIoOHiU3hrH3IuLR6busWhTX6UVXgd490hmJkIymmOXNH2+jJoC7Ebkeo3PiOfAdjqhb765QDlHSJOw== dependencies: - ember-cli-babel "^6.8.1" + ember-cli-babel "^7.23.0" ember-cli-typescript@3.0.0: version "3.0.0" @@ -6526,15 +6488,7 @@ ember-cli-typescript@^5.0.0: stagehand "^1.0.0" walk-sync "^2.2.0" -ember-cli-uglify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6" - integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g== - dependencies: - broccoli-uglify-sourcemap "^3.1.0" - lodash.defaultsdeep "^4.6.0" - -ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2: +ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3" integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg== @@ -6568,7 +6522,7 @@ ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1, ember-cli-ve semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~3.28.0: +ember-cli@~3.28.6: version "3.28.6" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.6.tgz#477a6a134501639d6cb03da6746158501c41efce" integrity sha512-aGHIDXM5KujhU+tHyfp1X5bUp3yj47sIWI0zgybyIw6vv6ErAu/eKWWMSib5PF8cQDdXG9vttBcXnvQ4QBNIPQ== @@ -6734,7 +6688,7 @@ ember-data-model-fragments@^6.0.0: git-repo-info "^2.1.1" npm-git-info "^1.0.3" -ember-data@~3.28.0: +ember-data@~3.28.6: version "3.28.13" resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.28.13.tgz#68668d84924453c2baeeb0cf7d25f75b2c07e8b9" integrity sha512-j1YjPl2JNHxQwQW6Bgfis44XSr4WCtdwMXr/SPpLsF1oVeTWIn3kwefcDnbuCI8Spmt1B9ab3ZLKzf2KkGN/7g== @@ -6794,7 +6748,7 @@ ember-export-application-global@^2.0.1: resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46" integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw== -ember-fetch@^8.0.1: +ember-fetch@^8.1.1: version "8.1.2" resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-8.1.2.tgz#651839780519319309127054786bf35cd4b84543" integrity sha512-TVx24/jrvDIuPL296DV0hBwp7BWLcSMf0I8464KGz01sPytAB+ZAePbc9ooBTJDkKZEGFgatJa4nj3yF1S9Bpw== @@ -6881,7 +6835,7 @@ ember-intl@^4.2.2: silent-error "^1.1.1" walk-sync "^2.0.1" -ember-load-initializers@^2.1.1: +ember-load-initializers@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa" integrity sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw== @@ -6960,7 +6914,7 @@ ember-on-helper@^0.1.0: dependencies: ember-cli-babel "^7.7.3" -ember-page-title@^6.0.0: +ember-page-title@^6.2.2: version "6.2.2" resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324" integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg== @@ -7003,18 +6957,20 @@ ember-power-calendar@^0.20.0: ember-element-helper "^0.8.2" ember-truth-helpers "^3.1.0" -ember-qunit@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.6.0.tgz#ad79fd3ff00073a8779400cc5a4b44829517590f" - integrity sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ== +ember-qunit@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444" + integrity sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A== dependencies: - "@ember/test-helpers" "^1.7.1" - broccoli-funnel "^2.0.2" + broccoli-funnel "^3.0.8" broccoli-merge-trees "^3.0.2" - common-tags "^1.4.0" - ember-cli-babel "^7.12.0" - ember-cli-test-loader "^2.2.0" - qunit "^2.9.3" + common-tags "^1.8.0" + ember-auto-import "^1.11.3" + ember-cli-babel "^7.26.6" + ember-cli-test-loader "^3.0.0" + resolve-package-path "^3.1.0" + silent-error "^1.1.1" + validate-peer-dependencies "^1.2.0" ember-ref-bucket@^4.0.0: version "4.1.0" @@ -7033,7 +6989,7 @@ ember-render-helpers@^0.2.0: ember-cli-babel "^7.23.0" ember-cli-typescript "^4.0.0" -ember-resolver@^8.0.0: +ember-resolver@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.1.0.tgz#8ada162746fde3e6ea6a703bbb9910fbe62ab1e5" integrity sha512-MGD7X2ztZVswGqs1mLgzhZJRhG7XiF6Mg4DgC7xJFWRYQQUHyGJpGdNWY9nXyrYnRIsCrQoL1do41zpxbrB/cg== @@ -7066,7 +7022,7 @@ ember-source-channel-url@^3.0.0: dependencies: node-fetch "^2.6.0" -ember-source@~3.28.0: +ember-source@~3.28.8: version "3.28.12" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.12.tgz#d8bb33d665d9c5adc858dce9d2d18be5ce58b2c0" integrity sha512-HGrBpY6TN+MAi7F6BS8XYtNFG6vtbKE9ttPcyj0Ps+76kP7isCHyN0hk8ecKciLq7JYDqiPDNWjdIXAn2JfhZA== @@ -7106,24 +7062,28 @@ ember-style-modifier@^0.8.0: ember-cli-babel "^7.26.6" ember-modifier "^3.2.7" -ember-template-lint@^2.9.1: - version "2.21.0" - resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b" - integrity sha512-19QbEqJQdMfcRS7PsQsubflRowEtnkbD0tpYR4q/xq4lodmhU7hhOFvlTQgbxD/jwW5Ur+tkOwH4KFy9JwOyXA== +ember-template-lint@^3.15.0: + version "3.16.0" + resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.16.0.tgz#7af2ec8d4386f4726be08c14c39ba121c56f0896" + integrity sha512-hbP4JefkOLx9tMkrZ3UIvdBNoEnrT7rg6c70tIxpB9F+KpPneDbmpGMBsQVhhK4BirTXIFwAIfnwKcwkIk3bPQ== dependencies: - chalk "^4.0.0" - ember-template-recast "^5.0.1" + "@ember-template-lint/todo-utils" "^10.0.0" + chalk "^4.1.2" + ci-info "^3.3.0" + date-fns "^2.28.0" + ember-template-recast "^5.0.3" find-up "^5.0.0" - fuse.js "^6.4.6" + fuse.js "^6.5.3" get-stdin "^8.0.0" - globby "^11.0.2" - is-glob "^4.0.1" - micromatch "^4.0.2" + globby "^11.0.4" + is-glob "^4.0.3" + micromatch "^4.0.4" + requireindex "^1.2.0" resolve "^1.20.0" - v8-compile-cache "^2.2.0" + v8-compile-cache "^2.3.0" yargs "^16.2.0" -ember-template-recast@^5.0.1: +ember-template-recast@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.3.tgz#79df27a70bdce7be17f14db13886afde1e9d02d6" integrity sha512-qsJYQhf29Dk6QMfviXhUPE+byMOs6iRQxUDHgkj8yqjeppvjHaFG96hZi/NAXJTm/M7o3PpfF5YlmeaKtI9UeQ== @@ -7149,14 +7109,6 @@ ember-test-selectors@^5.0.0: ember-cli-babel "^7.26.4" ember-cli-version-checker "^5.1.2" -ember-test-waiters@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe" - integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw== - dependencies: - ember-cli-babel "^7.11.0" - semver "^6.3.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" @@ -7466,14 +7418,23 @@ escodegen@^2.1.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-ember@^8.9.1: - version "8.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-8.14.0.tgz#fc4c5119b5a1c87604a7bf920ca397783b96b7be" - integrity sha512-PQhR58omMAZzcJOB8GLWzL6l/vjRZ2Uo1eohxOmgPUyeBkHfZAMlvK+OSeneMLIr4azLQ4GISkklwv6lxb8qnw== +eslint-config-prettier@^8.3.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" + integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== + +eslint-plugin-ember@^10.5.8: + version "10.6.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.6.1.tgz#04ea84cc82307f64a2faa4f2855b30e5ebf9f722" + integrity sha512-R+TN3jwhYQ2ytZCA1VkfJDZSGgHFOHjsHU1DrBlRXYRepThe56PpuGxywAyDvQ7inhoAz3e6G6M60PzpvjzmNg== dependencies: "@ember-data/rfc395-data" "^0.0.4" + css-tree "^2.0.4" ember-rfc176-data "^0.3.15" + eslint-utils "^3.0.0" + estraverse "^5.2.0" lodash.kebabcase "^4.1.1" + requireindex "^1.2.0" snake-case "^3.0.3" eslint-plugin-es@^3.0.0: @@ -7496,6 +7457,21 @@ eslint-plugin-node@^11.1.0: resolve "^1.10.1" semver "^6.1.0" +eslint-plugin-prettier@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5" + integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-qunit@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d" + integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw== + dependencies: + eslint-utils "^3.0.0" + requireindex "^1.2.0" + eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -7519,6 +7495,13 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" @@ -7529,7 +7512,7 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@^7.5.0: +eslint@^7.32.0: version "7.32.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== @@ -7877,6 +7860,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-diff@^1.1.2: + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" + integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== + fast-glob@^2.2.2: version "2.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" @@ -8059,14 +8047,6 @@ find-babel-config@^1.1.0, find-babel-config@^1.2.0: json5 "^0.5.1" path-exists "^3.0.0" -find-babel-config@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701" - integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw== - dependencies: - json5 "^2.1.1" - path-exists "^4.0.0" - find-cache-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" @@ -8471,7 +8451,7 @@ functions-have-names@^1.2.3: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -fuse.js@^6.4.6: +fuse.js@^6.5.3: version "6.6.2" resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.6.2.tgz#fe463fed4b98c0226ac3da2856a415576dc9a111" integrity sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA== @@ -8635,17 +8615,6 @@ glob@^7.0.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.3: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - global-dirs@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" @@ -8727,7 +8696,7 @@ globby@13.2.2: merge2 "^1.4.1" slash "^4.0.0" -globby@^11.0.2, globby@^11.0.3: +globby@^11.0.3, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -9998,7 +9967,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.1, json5@^2.1.2, json5@^2.2.3: +json5@^2.1.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -10350,7 +10319,7 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1: +lodash.defaultsdeep@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== @@ -10801,6 +10770,11 @@ mdast-util-to-string@^3.1.0: dependencies: "@types/mdast" "^3.0.0" +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -11174,13 +11148,6 @@ minimalistic-crypto-utils@^1.0.1: dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - minimist@^0.2.1: version "0.2.4" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.4.tgz#0085d5501e29033748a2f2a4da0180142697a475" @@ -12334,6 +12301,18 @@ pretender@^3.4.7: fake-xml-http-request "^2.1.2" route-recognizer "^0.3.3" +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@^2.5.1: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + pretty-ms@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25" @@ -12564,7 +12543,7 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: rimraf "^2.5.4" underscore.string "~3.3.4" -qunit-dom@^1.2.0: +qunit-dom@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-1.6.0.tgz#a4bea6a46329d221e4a317d712cb40709107b977" integrity sha512-YwSqcLjQcRI0fUFpaSWwU10KIJPFW5Qh+d3cT5DOgx81dypRuUSiPkKFmBY/CDs/R1KdHRadthkcXg2rqAon8Q== @@ -12574,7 +12553,7 @@ qunit-dom@^1.2.0: ember-cli-babel "^7.23.0" ember-cli-version-checker "^5.1.1" -qunit@^2.9.3: +qunit@^2.17.2: version "2.20.0" resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.20.0.tgz#66a404a0142781316bbda91535869ce5671555b1" integrity sha512-N8Fp1J55waE+QG1KwX2LOyqulZUToRrrPBqDOfYfuAMkEglFL15uwvmH1P4Tq/omQ/mGbBI8PEB3PhIfvUb+jg== @@ -12950,6 +12929,11 @@ require-relative@^0.8.7: resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" integrity sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg== +requireindex@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef" + integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww== + requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -12960,7 +12944,7 @@ reselect@^3.0.1: resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147" integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA== -reselect@^4.0.0, reselect@^4.1.7: +reselect@^4.0.0: version "4.1.8" resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== @@ -13027,7 +13011,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -13528,7 +13512,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1: +silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662" integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw== @@ -13704,7 +13688,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -14282,7 +14266,7 @@ terser-webpack-plugin@^5.3.7: serialize-javascript "^6.0.1" terser "^5.16.8" -terser@^4.1.2, terser@^4.3.9: +terser@^4.1.2: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== @@ -14291,7 +14275,7 @@ terser@^4.1.2, terser@^4.3.9: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.16.8: +terser@^5.16.8, terser@^5.3.0: version "5.21.0" resolved "https://registry.yarnpkg.com/terser/-/terser-5.21.0.tgz#d2b27e92b5e56650bc83b6defa00a110f0b124b2" integrity sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw== @@ -14561,7 +14545,7 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -14935,7 +14919,7 @@ uvu@^0.5.0: kleur "^4.0.3" sade "^1.7.3" -v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: +v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128" integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw== @@ -14955,6 +14939,14 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +validate-peer-dependencies@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036" + integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA== + dependencies: + resolve-package-path "^3.1.0" + semver "^7.3.2" + validate-peer-dependencies@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4" @@ -15286,12 +15278,7 @@ workerpool@^3.1.1: object-assign "4.1.1" rsvp "^4.8.4" -workerpool@^5.0.1: - version "5.0.4" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2" - integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ== - -workerpool@^6.0.2, workerpool@^6.1.4: +workerpool@^6.0.0, workerpool@^6.1.4: version "6.5.1" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==