diff --git a/.babelrc.json b/.babelrc.json new file mode 100644 index 0000000000000000000000000000000000000000..9d8d625dfb7edf32ec111578cb2d0b4db10aa035 --- /dev/null +++ b/.babelrc.json @@ -0,0 +1,3 @@ +[ + "@babel/plugin-proposal-private-property-in-object", { "loose": true } +] \ No newline at end of file diff --git a/app/components/tag/item.hbs b/app/components/tag/item.hbs index 161eb5bdf3296e70a6d32967d1b2643db9411b25..18874576c2a977c3ee941302c2ddfb25f585abf5 100644 --- a/app/components/tag/item.hbs +++ b/app/components/tag/item.hbs @@ -1,5 +1,5 @@ <div class="tag tag-item"> - <span style="background-color: {{@bg_color}}; color: {{@fg_color}}"> - {{@name}} - </span> + <span style="{{this.inlineStyle}}"> + {{@name}} + </span> </div> diff --git a/app/components/tag/item.js b/app/components/tag/item.js new file mode 100644 index 0000000000000000000000000000000000000000..65ca62b6edffc7ae3c1e8d2e9a9ef1958fde165c --- /dev/null +++ b/app/components/tag/item.js @@ -0,0 +1,48 @@ +import Component from '@glimmer/component'; +import { htmlSafe } from '@ember/template'; + + +export default class TagItemComponent extends Component { + + _ensure_safe_html_color(value, default_value) { + /* + make sure we use '#rrggbb' format strings here + */ + + if (this._is_valid_color(value)) { + return value; + } + + // if not a valid color format here, + // just return a (safe) default value for that color + + return default_value; + } + + _is_valid_color(value) { + // TODO: use regexp here + return value.length === 7 && value[0] === '#'; + } + + get bg_color() { + return this._ensure_safe_html_color( + this.args.bg_color, + '#0000ff' + ); + } + + get fg_color() { + return this._ensure_safe_html_color( + this.args.fg_color, + '#ffffff' + ); + } + + get inlineStyle() { + let _style; + + _style = `background-color: ${this.bg_color}; color: ${this.fg_color}` + + return htmlSafe(_style); + } +} \ No newline at end of file diff --git a/app/components/tag/table_row.js b/app/components/tag/table_row.js index 5c9714879046b00c34f46f7ab390c7ae4f9fab55..8df00e954ecd0db55ed5832172065ad5fab6b1de 100644 --- a/app/components/tag/table_row.js +++ b/app/components/tag/table_row.js @@ -3,6 +3,7 @@ import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; import { inject as service } from '@ember/service'; + export default class TableRowComponent extends Component { // keeps track of the ID of the tag currently // being edited i.e. in edit mode diff --git a/config/environment.js b/config/environment.js index c0500c8ad0a325c06352b8d2f1032144f6b38036..a0e1e99c1204b216241a100181d4285a697fa65b 100644 --- a/config/environment.js +++ b/config/environment.js @@ -45,6 +45,11 @@ module.exports = function (environment) { ENV.APP.rootElement = '#ember-testing'; ENV.APP.autoboot = false; + + // enable migrage - which mocks HTTP requests + ENV['ember-cli-mirage'] = { + enabled: true, + }; } if (environment === 'production') { diff --git a/mirage/config.js b/mirage/config.js new file mode 100644 index 0000000000000000000000000000000000000000..a76acf3a67a8235f28dc0c4a88e1840557686085 --- /dev/null +++ b/mirage/config.js @@ -0,0 +1,79 @@ +export default function() { + + this.get('/api/users/me/', () => { + return { + "data":{ + "type":"users", + "id":"1", + "attributes": + { + "username":"eugen", + "first_name":"", + "last_name":"", + "email":"", + "is_active":true, + "is_staff":true, + "is_superuser":true, + "date_joined":"2021-11-24T20:54:38.690996+01:00" + }, + "relationships": { + "inbox_folder": { + "data": { + "type":"folders", + "id":"1" + } + }, + "home_folder": { + "data": { + "type":"folders", + "id":"2" + } + } + } + } // data + } // return + }); + + this.get('/api/folders/2/', () => { + return { + "data": { + "type": "folders", + "id":"2", + "attributes": { + "title": ".home", + "created_at": "2021-11-24T20:54:38.833485+01:00", + "updated_at":"2021-11-24T20:54:38.833509+01:00" + }, + "relationships": { + "parent": { + "data":null + } + } + } + } + }); + + this.get('/api/tags/', () => { + return { + "data": [ + { + "type": "tags", + "id": "1", + "attributes": { + "name": "one", + "bg_color": "#006684", + "fg_color":"#ffffff", + "description":"", + "pinned":false + } + } + ] + } + }); + + this.get('/api/roles/', () => { + return { + "data": [] + } + }); +} diff --git a/mirage/scenarios/default.js b/mirage/scenarios/default.js new file mode 100644 index 0000000000000000000000000000000000000000..adb3af4c0d1f20337d9d4ca2e57281333c3a4abb --- /dev/null +++ b/mirage/scenarios/default.js @@ -0,0 +1,9 @@ +export default function(/* server */) { + + /* + Seed your development database using your factories. + This data will not be loaded in your tests. + */ + + // server.createList('post', 10); +} diff --git a/mirage/serializers/application.js b/mirage/serializers/application.js new file mode 100644 index 0000000000000000000000000000000000000000..b3391458f214431bc5d6d3578eefa367a97c4250 --- /dev/null +++ b/mirage/serializers/application.js @@ -0,0 +1,18 @@ +import { underscore } from '@ember/string'; +import { JSONAPISerializer } from 'ember-cli-mirage'; + +/* +export default JSONAPISerializer.extend({ +}); +*/ + + +export default class ApplicationSerializer extends JSONAPISerializer { + keyForAttribute(attr) { + return underscore(attr); + } + + keyForRelationship(attr) { + return underscore(attr); + } +} diff --git a/package-lock.json b/package-lock.json index 46bc145950185c00b9209cd612f75c0fc4e83f11..fecb7f5da39296493a3ef89f094b9c1c716320a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2638,6 +2638,85 @@ "semver": "^7.3.2" } }, + "@embroider/shared-internals": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-0.40.0.tgz", + "integrity": "sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==", + "dev": true, + "requires": { + "ember-rfc176-data": "^0.3.17", + "fs-extra": "^7.0.1", + "lodash": "^4.17.10", + "pkg-up": "^3.1.0", + "resolve-package-path": "^1.2.2", + "semver": "^7.3.2", + "typescript-memoize": "^1.0.0-alpha.3" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "requires": { + "find-up": "^3.0.0" + } + }, + "resolve-package-path": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-1.2.7.tgz", + "integrity": "sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==", + "dev": true, + "requires": { + "path-root": "^0.1.1", + "resolve": "^1.10.0" + } + } + } + }, "@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -2977,6 +3056,12 @@ "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", "dev": true }, + "@miragejs/pretender-node-polyfill": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz", + "integrity": "sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==", + "dev": true + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -9389,6 +9474,71 @@ "integrity": "sha1-IMtop5D+D94kiN39jvu332/nZvI=", "dev": true }, + "ember-cli-mirage": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ember-cli-mirage/-/ember-cli-mirage-2.2.0.tgz", + "integrity": "sha512-w+DrFEGuuLyHzJwOVkG0yOLvgwYezaMBNvvZJQzQkv1W3CsdhllkY1ZauYgL0dhrmYJwRFtp8DnaPQwBTDCSfA==", + "dev": true, + "requires": { + "@embroider/macros": "^0.40.0", + "broccoli-file-creator": "^2.1.1", + "broccoli-funnel": "^3.0.3", + "broccoli-merge-trees": "^4.2.0", + "ember-auto-import": "^1.2.19", + "ember-cli-babel": "^7.5.0", + "ember-get-config": "^0.2.4 || ^0.3.0", + "ember-inflector": "^2.0.0 || ^3.0.0 || ^4.0.0", + "lodash-es": "^4.17.11", + "miragejs": "^0.1.31" + }, + "dependencies": { + "@embroider/macros": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.40.0.tgz", + "integrity": "sha512-ygChvFoebSi/N8b+A+XFncd454gLYBYHancrtY0AE/h6Y1HouoqQvji/IfaLisGoeuwUWuI9rCBv97COweu/rA==", + "dev": true, + "requires": { + "@embroider/shared-internals": "0.40.0", + "assert-never": "^1.1.0", + "ember-cli-babel": "^7.23.0", + "lodash": "^4.17.10", + "resolve": "^1.8.1", + "semver": "^7.3.2" + } + }, + "broccoli-merge-trees": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz", + "integrity": "sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==", + "dev": true, + "requires": { + "broccoli-plugin": "^4.0.2", + "merge-trees": "^2.0.0" + } + }, + "broccoli-plugin": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz", + "integrity": "sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==", + "dev": true, + "requires": { + "broccoli-node-api": "^1.7.0", + "broccoli-output-wrapper": "^3.2.5", + "fs-merger": "^3.2.1", + "promise-map-series": "^0.3.0", + "quick-temp": "^0.1.8", + "rimraf": "^3.0.2", + "symlink-or-copy": "^1.3.1" + } + }, + "promise-map-series": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/promise-map-series/-/promise-map-series-0.3.0.tgz", + "integrity": "sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==", + "dev": true + } + } + }, "ember-cli-normalize-entity-name": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz", @@ -10248,6 +10398,37 @@ } } }, + "ember-get-config": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ember-get-config/-/ember-get-config-0.3.0.tgz", + "integrity": "sha512-0e2pKzwW5lBZ4oJnvu9qHOht4sP1MWz/m3hyz8kpSoMdrlZVf62LDKZ6qfKgy8drcv5YhCMYE6QV7MhnqlrzEQ==", + "dev": true, + "requires": { + "broccoli-file-creator": "^1.1.1", + "ember-cli-babel": "^7.0.0" + }, + "dependencies": { + "broccoli-file-creator": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz", + "integrity": "sha512-l9zthHg6bAtnOfRr/ieZ1srRQEsufMZID7xGYRW3aBDv3u/3Eux+Iawl10tAGYE5pL9YB4n5X4vxkp6iNOoZ9g==", + "dev": true, + "requires": { + "broccoli-plugin": "^1.1.0", + "mkdirp": "^0.5.1" + } + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + } + } + }, "ember-getowner-polyfill": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz", @@ -12258,6 +12439,12 @@ "integrity": "sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==", "dev": true }, + "fake-xml-http-request": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz", + "integrity": "sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==", + "dev": true + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -13702,6 +13889,12 @@ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", "dev": true }, + "inflected": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz", + "integrity": "sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==", + "dev": true + }, "inflection": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz", @@ -14433,6 +14626,12 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", + "dev": true + }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", @@ -14511,6 +14710,12 @@ "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=", "dev": true }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true + }, "lodash.castarray": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz", @@ -14523,6 +14728,12 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, + "lodash.compact": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash.compact/-/lodash.compact-3.0.1.tgz", + "integrity": "sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=", + "dev": true + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -14556,6 +14767,30 @@ "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=", "dev": true }, + "lodash.forin": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.forin/-/lodash.forin-4.4.0.tgz", + "integrity": "sha1-XT8grlZAEfvog4H32YlJyclRlzE=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.has": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", + "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=", + "dev": true + }, + "lodash.invokemap": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz", + "integrity": "sha1-F0jNpdiw74NpxOs+xUwh/rofLWI=", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -14568,6 +14803,36 @@ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, + "lodash.isempty": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", + "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.isfunction": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", + "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", + "dev": true + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, "lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", @@ -14585,6 +14850,24 @@ "lodash.isarray": "^3.0.0" } }, + "lodash.lowerfirst": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz", + "integrity": "sha1-3jx7EuAsZSSgBZwvbLfFxSZVoT0=", + "dev": true + }, + "lodash.map": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", + "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=", + "dev": true + }, + "lodash.mapvalues": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", + "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", + "dev": true + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -14603,12 +14886,24 @@ "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=", "dev": true }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", + "dev": true + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=", + "dev": true + }, "lodash.template": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", @@ -14646,6 +14941,12 @@ "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=", "dev": true }, + "lodash.values": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz", + "integrity": "sha1-o6bCsOvsxcLLocF+bmIP6BtT00c=", + "dev": true + }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -15114,6 +15415,54 @@ } } }, + "miragejs": { + "version": "0.1.42", + "resolved": "https://registry.npmjs.org/miragejs/-/miragejs-0.1.42.tgz", + "integrity": "sha512-35Gl2Pubkj/9Xk/D5/JcKJyspPWCNcpMkrlEpP0ArjQ4wKINQaFIgg5R/LW5v/yvsLpMjf9tzZuHtO3NDZeZow==", + "dev": true, + "requires": { + "@miragejs/pretender-node-polyfill": "^0.1.0", + "inflected": "^2.0.4", + "lodash.assign": "^4.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.compact": "^3.0.1", + "lodash.find": "^4.6.0", + "lodash.flatten": "^4.4.0", + "lodash.forin": "^4.4.0", + "lodash.get": "^4.4.2", + "lodash.has": "^4.5.2", + "lodash.invokemap": "^4.6.0", + "lodash.isempty": "^4.4.0", + "lodash.isequal": "^4.5.0", + "lodash.isfunction": "^3.0.9", + "lodash.isinteger": "^4.0.4", + "lodash.isplainobject": "^4.0.6", + "lodash.lowerfirst": "^4.3.1", + "lodash.map": "^4.6.0", + "lodash.mapvalues": "^4.6.0", + "lodash.pick": "^4.4.0", + "lodash.snakecase": "^4.1.1", + "lodash.uniq": "^4.5.0", + "lodash.uniqby": "^4.7.0", + "lodash.values": "^4.3.0", + "pretender": "^3.4.7" + }, + "dependencies": { + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + } + } + }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", @@ -16334,6 +16683,16 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, + "pretender": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/pretender/-/pretender-3.4.7.tgz", + "integrity": "sha512-jkPAvt1BfRi0RKamweJdEcnjkeu7Es8yix3bJ+KgBC5VpG/Ln4JE3hYN6vJym4qprm8Xo5adhWpm3HCoft1dOw==", + "dev": true, + "requires": { + "fake-xml-http-request": "^2.1.2", + "route-recognizer": "^0.3.3" + } + }, "prettier": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", @@ -17043,6 +17402,12 @@ "estree-walker": "^0.6.1" } }, + "route-recognizer": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/route-recognizer/-/route-recognizer-0.3.4.tgz", + "integrity": "sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==", + "dev": true + }, "rsvp": { "version": "4.8.5", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", diff --git a/package.json b/package.json index e068682fdc50c49c26b83a1dcd4d64e5f8bc9d61..d6668b6e5bafe34eac258bb53aacbe18eb285bb2 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "ember-cli-dependency-checker": "^3.2.0", "ember-cli-htmlbars": "^5.7.1", "ember-cli-inject-live-reload": "^2.1.0", + "ember-cli-mirage": "^2.2.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/acceptance/.gitkeep b/tests/acceptance/.gitkeep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tests/acceptance/roles-test.js b/tests/acceptance/roles-test.js index fa36877af199970c2567aaa93f7250020e44b5d9..8bbbccf84578d128e213b390565111b0b514f987 100644 --- a/tests/acceptance/roles-test.js +++ b/tests/acceptance/roles-test.js @@ -1,14 +1,26 @@ import { module, test } from 'qunit'; import { visit, currentURL } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; + module('Acceptance | roles', function (hooks) { setupApplicationTest(hooks); + setupMirage(hooks); + + hooks.beforeEach(async function () { + await authenticateSession({ + authToken: '12345', + otherData: 'some-data' + }); + }); + test('visiting /roles', async function (assert) { await visit('/roles'); assert.equal(currentURL(), '/roles'); - assert.dom('.add-role').hasText('New', 'The user can add new role'); + assert.dom('.roles-add').hasText('New', 'The user can add new role'); }); }); diff --git a/tests/acceptance/tags-test.js b/tests/acceptance/tags-test.js index 359cb667beff87b3cafb243f1e651f08a83e6d9b..173359a4ab22b3c07075d9c4ed9291fccc1b831b 100644 --- a/tests/acceptance/tags-test.js +++ b/tests/acceptance/tags-test.js @@ -1,9 +1,21 @@ import { module, test } from 'qunit'; import { visit, currentURL } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; + + module('Acceptance | tags', function (hooks) { setupApplicationTest(hooks); + setupMirage(hooks); + + hooks.beforeEach(async function () { + await authenticateSession({ + authToken: '12345', + otherData: 'some-data' + }); + }); test('visiting /tags', async function (assert) { await visit('/tags');