Skip to content

Commit

Permalink
Merge pull request #18458 from Alonski/bugfix/query-params-helper
Browse files Browse the repository at this point in the history
[BUGFIX] Using query params helper outside of link-to

(cherry picked from commit f786e42)
  • Loading branch information
chancancode committed Oct 8, 2019
1 parent 77ed0b8 commit 89fc067
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
14 changes: 7 additions & 7 deletions packages/@ember/-internals/glimmer/lib/components/link-to.ts
Original file line number Diff line number Diff line change
Expand Up @@ -864,14 +864,14 @@ if (EMBER_GLIMMER_ANGLE_BRACKET_BUILT_INS) {
)
);

if (DEBUG && this.query === UNDEFINED) {
let { _models: models } = this;
let lastModel = models.length > 0 && models[models.length - 1];
let { _models: models } = this;
if (models.length > 0) {
let lastModel = models[models.length - 1];

assert(
'The `(query-params)` helper can only be used when invoking the `{{link-to}}` component.',
!(lastModel && lastModel.isQueryParams)
);
if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
this.query = lastModel.values;
models.pop();
}
}

return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,19 @@ moduleFor(
});
}

async ['@feature(ember-glimmer-angle-bracket-built-ins) `(query-params)` must be used in conjunction with `{{link-to}}'](
assert
) {
async ['@feature(ember-glimmer-angle-bracket-built-ins) `(query-params)` must be used in conjunction with `{{link-to}}']() {
this.addTemplate(
'index',
`{{#let (query-params foo='456' bar='NAW') as |qp|}}{{link-to 'Index' 'index' qp}}{{/let}}`
`{{#let (query-params foo='456' alon='BUKAI') as |qp|}}{{link-to 'Index' 'index' qp}}{{/let}}`
);

// TODO If we visit this page at all in production mode, it'll fail for
// entirely different reasons than what this test is trying to test.
let promise = DEBUG ? this.visit('/') : null;

await assert.rejectsAssertion(
promise,
/The `\(query-params\)` helper can only be used when invoking the `{{link-to}}` component\./
);
return this.visit('/').then(() => {
this.assertComponentElement(this.firstChild, {
tagName: 'a',
attrs: { href: '/?alon=BUKAI&foo=456', class: classMatcher('ember-view') },
content: 'Index',
});
});
}
}
);
Expand Down

0 comments on commit 89fc067

Please sign in to comment.