Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(test-helpers): [BREAKING] remove link cache #658

Merged
merged 1 commit into from
Nov 18, 2021
Merged

refactor(test-helpers): [BREAKING] remove link cache #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions addon-test-support/-private/services/test-instrumented-link-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,14 @@
import { LinkParams } from 'ember-link';
import LinkManagerService from 'ember-link/services/link-manager';

import stringify from 'fast-json-stable-stringify';

import TestLink from '../../test-link';

export default class TestInstrumentedLinkManagerService extends LinkManagerService {
private _linkCache?: Map<string, TestLink>;

/**
* Creates a `UILink` instance, or a `TestLink` instance when `setupLink`
* has been called.
*/
createUILink(linkParams: LinkParams): TestLink {
if (!this._linkCache) {
this._linkCache = new Map();
}

const cacheKey = stringify(linkParams);

if (this._linkCache.has(cacheKey)) {
return this._linkCache.get(cacheKey) as TestLink;
}

const link = new TestLink(this, linkParams);

this._linkCache.set(cacheKey, link);

return link;
return new TestLink(this, linkParams);
}
}
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@
},
"dependencies": {
"@glimmer/tracking": "~1.0.3",
"ember-auto-import": "^1.10.1",
"ember-cli-babel": "^7.23.0",
"ember-cli-htmlbars": "^6.0.0",
"ember-cli-typescript": "^4.1.0",
"fast-json-stable-stringify": "^2.1.0"
"ember-cli-typescript": "^4.1.0"
},
"devDependencies": {
"@clark/ember-template-lint-config": "0.2.2",
Expand All @@ -56,6 +54,7 @@
"@types/sinon": "10.0.6",
"broccoli-asset-rev": "3.0.0",
"ember-array-helper": "5.1.0",
"ember-auto-import": "1.10.1",
"ember-cli": "3.28.4",
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-inject-live-reload": "2.1.0",
Expand Down
27 changes: 0 additions & 27 deletions tests/unit/test-helpers/test-instrumented-link-manager-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,4 @@ module('Unit | Service | test-instrumented-link-manager', function (hooks) {

assert.ok(link instanceof TestLink);
});

test('it returns a cached test link when one exists', async function (assert) {
const linkManager = this.owner.lookup(
'service:link-manager'
) as TestInstrumentedLinkManagerService;

const firstLink = linkManager.createUILink({
route: 'dummy',
models: [1, 2, { name: 'horse' }],
query: { page: 'yes' }
});
const secondLink = linkManager.createUILink({
route: 'dummy',
models: [1, 2, { name: 'horse' }],
query: { page: 'yes' }
});

assert.strictEqual(firstLink, secondLink);

const thirdLink = linkManager.createUILink({
route: 'dummy',
models: [1, 2, 3],
query: { page: 'yes' }
});

assert.notStrictEqual(firstLink, thirdLink);
});
});
7 changes: 1 addition & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6397,7 +6397,7 @@ ember-assign-polyfill@^2.6.0:
ember-cli-babel "^6.16.0"
ember-cli-version-checker "^2.0.0"

ember-auto-import@^1.10.1:
[email protected]:
version "1.10.1"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.10.1.tgz#6c93a875e494aa0a58b759867d3f20adfd514ae3"
integrity sha512-7bOWzPELlVwdWDOkB+phDIjg8BNW+/2RiLLQ+Xa/eIvCLT4ABYhHV5wqW5gs5BnXTDVLfE4ddKZdllnGuPGGDQ==
Expand Down Expand Up @@ -8040,11 +8040,6 @@ fast-json-stable-stringify@^2.0.0:
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=

fast-json-stable-stringify@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==

fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
Expand Down