Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 26 additions & 11 deletions tests/src/RoutesAndParams.njs
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ class RoutesAndParams extends Nullstack {

eventTriggered = false;
paramHydrated = false;
shownLink = true;
htmlLinkBtn = '';
innerHTMLData = {
shownLink: true,
btnText: '',
doubleLink: false
};

hydrate(context) {
const { router, params } = context;
this.paramHydrated = params.id === 'a';
window.addEventListener(router.event, () => {
context.eventTriggered = true;
});
this.shownLink = !params.hideLink;
this.htmlLinkBtn = 'click';
this.innerHTMLData.shownLink = !params.hideLink;
this.innerHTMLData.btnText = 'click';
}

renderOther({ params }) {
Expand All @@ -34,17 +37,29 @@ class RoutesAndParams extends Nullstack {
}

renderInnerHTML({ params, route }) {
const html = `
<a href="${route}?hideLink=${params.hideLink}"> innerHTML </a>
const hideLinkParam = params.hideLink ? '?hideLink=true' : '';
const link = (dataset = '') => `
<a href="${route}${hideLinkParam}" ${dataset}>innerHTML</a>
`
const doubleLink = link() + link('data-link2');
const html = !this.innerHTMLData.doubleLink ? link() : doubleLink;
const updateHTMLData = (newVal) => () => {
this.innerHTMLData = { ...this.innerHTMLData, ...newVal };
}

return (
<div data-shown-link={this.shownLink}>
<div>
<button
onclick={updateHTMLData({ btnText: 'clicked', shownLink: true })}
data-show-link={this.innerHTMLData.btnText}
html={this.innerHTMLData.btnText}
/>
<button
onclick={{shownLink: true, htmlLinkBtn: 'clicked'}}
data-show-link={this.htmlLinkBtn}
html={this.htmlLinkBtn}
onclick={updateHTMLData({ doubleLink: true })}
data-double-link
html="doubleLinks"
/>
<div html={this.shownLink ? html : ''} />
<div html={this.innerHTMLData.shownLink ? html : ''} />
</div>
)
}
Expand Down
37 changes: 25 additions & 12 deletions tests/src/RoutesAndParams.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,26 +233,39 @@ describe('RoutesAndParams /routes-and-params?previous=true', () => {

describe('RoutesAndParams /routes-and-params/inner-html', () => {

const htmlRoute = 'routes-and-params/inner-html?hideLink=';
const htmlRoute = 'routes-and-params/inner-html';

async function redirectAndKeepState(hiddenLink = '') {
await page.goto(`http://localhost:6969/${htmlRoute}${hiddenLink}`);
test('html route injected from start do not refresh', async () => {
await page.goto(`http://localhost:6969/${htmlRoute}`);
await page.waitForSelector('[data-show-link="click"]');
await page.click('[data-show-link="click"]');
await page.waitForSelector('[data-show-link="clicked"]');
await page.waitForSelector('[data-shown-link]');
await page.waitForSelector(`[href="/${htmlRoute}${hiddenLink}"]`);
await page.click(`[href="/${htmlRoute}${hiddenLink}"]`);
return page.$('[data-show-link="clicked"]');
}

test('html route injected from start do not refresh', async () => {
const element = await redirectAndKeepState();
await page.waitForSelector(`[href="/${htmlRoute}"]`);
await page.click(`[href="/${htmlRoute}"]`);
const element = await page.$('[data-show-link="clicked"]');
expect(element).toBeTruthy();
});

test('html route injected after first render do not refresh', async () => {
const element = await redirectAndKeepState('true');
await page.goto(`http://localhost:6969/${htmlRoute}?hideLink=true`);
await page.waitForSelector('[data-show-link="click"]');
await page.click('[data-show-link="click"]');
await page.waitForSelector('[data-show-link="clicked"]');
await page.waitForSelector(`[href="/${htmlRoute}?hideLink=true"]`);
await page.click(`[href="/${htmlRoute}?hideLink=true"]`);
const element = await page.$('[data-show-link="clicked"]');
expect(element).toBeTruthy();
});

test('html route added beside existent do not refresh', async () => {
await page.goto(`http://localhost:6969/${htmlRoute}`);
await page.waitForSelector('[data-show-link="click"]');
await page.click('[data-show-link="click"]');
await page.waitForSelector('[data-show-link="clicked"]');
await page.click('[data-double-link]');
await page.waitForSelector('[data-link2]');
await page.click('[data-link2]');
const element = await page.$('[data-show-link="clicked"]');
expect(element).toBeTruthy();
});

Expand Down