🐛 fixed fields autocomplete not working in popup #17701
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,23 +23,27 @@ const setup = async ({site, member = null}) => { | |
| const utils = appRender( | ||
| <App api={ghostApi} /> | ||
| ); | ||
| const triggerButtonFrame = await utils.findByTitle(/portal-trigger/i); | ||
|
|
||
| const overlay = utils.queryByTitle(/portal-overlay/i); | ||
| const emailInput = within(overlay).queryByLabelText(/email/i); | ||
| const nameInput = within(overlay).queryByLabelText(/name/i); | ||
| const submitButton = within(overlay).queryByRole('button', {name: 'Continue'}); | ||
| const signinButton = within(overlay).queryByRole('button', {name: 'Sign in'}); | ||
| const siteTitle = within(overlay).queryByText(site.title); | ||
| const freePlanTitle = within(overlay).queryByText('Free'); | ||
| const monthlyPlanTitle = within(overlay).queryByText('Monthly'); | ||
| const yearlyPlanTitle = within(overlay).queryByText('Yearly'); | ||
| const fullAccessTitle = within(overlay).queryByText('Full access'); | ||
|
|
||
| const getIframeDocument = async () => { | ||
| const iframe = await within(utils.baseElement).findByTitle(/portal-popup/i); | ||
| return iframe.contentDocument; | ||
| }; | ||
|
|
||
| return { | ||
| ghostApi, | ||
| overlay, | ||
| triggerButtonFrame, | ||
| siteTitle, | ||
| emailInput, | ||
|
|
@@ -50,7 +54,8 @@ const setup = async ({site, member = null}) => { | |
| monthlyPlanTitle, | ||
| yearlyPlanTitle, | ||
| fullAccessTitle, | ||
| ...utils, | ||
| getIframeDocument | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -76,22 +81,28 @@ const multiTierSetup = async ({site, member = null}) => { | |
| ); | ||
| const freeTierDescription = site.products?.find(p => p.type === 'free')?.description; | ||
| const triggerButtonFrame = await utils.findByTitle(/portal-trigger/i); | ||
|
|
||
| const overlay = utils.queryByTitle(/portal-overlay/i); | ||
|
|
||
| const emailInput = within(overlay).queryByLabelText(/email/i); | ||
| const nameInput = within(overlay).queryByLabelText(/name/i); | ||
| const submitButton = within(overlay).queryByRole('button', {name: 'Continue'}); | ||
| const signinButton = within(overlay).queryByRole('button', {name: 'Sign in'}); | ||
| const siteTitle = within(overlay).queryByText(site.title); | ||
| const freePlanTitle = within(overlay).queryAllByText(/free$/i); | ||
| const freePlanDescription = within(overlay).queryAllByText(freeTierDescription); | ||
| const monthlyPlanTitle = within(overlay).queryByText('Monthly'); | ||
| const yearlyPlanTitle = within(overlay).queryByText('Yearly'); | ||
| const fullAccessTitle = within(overlay).queryByText('Full access'); | ||
|
|
||
| const getIframeDocument = async () => { | ||
| const iframe = await within(utils.baseElement).findByTitle(/portal-popup/i); | ||
| return iframe.contentDocument; | ||
| }; | ||
|
|
||
| return { | ||
| ghostApi, | ||
| overlay, | ||
| triggerButtonFrame, | ||
| siteTitle, | ||
| emailInput, | ||
|
|
@@ -103,7 +114,8 @@ const multiTierSetup = async ({site, member = null}) => { | |
| yearlyPlanTitle, | ||
| fullAccessTitle, | ||
| freePlanDescription, | ||
| ...utils, | ||
| getIframeDocument | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -123,12 +135,11 @@ describe('Signin', () => { | |
| }); | ||
| test('with default settings', async () => { | ||
| const { | ||
| ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, getIframeDocument | ||
| } = await setup({ | ||
| site: FixtureSite.singleTier.basic | ||
| }); | ||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -138,23 +149,24 @@ describe('Signin', () => { | |
|
|
||
| expect(emailInput).toHaveValue('[email protected]'); | ||
|
|
||
| fireEvent.click(submitButton); | ||
|
|
||
| expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({ | ||
| email: '[email protected]', | ||
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('without name field', async () => { | ||
| const {ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, getIframeDocument} = await setup({ | ||
| site: FixtureSite.singleTier.withoutName | ||
| }); | ||
|
|
||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -170,17 +182,18 @@ describe('Signin', () => { | |
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('with only free plan', async () => { | ||
| let {ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, | ||
| getIframeDocument} = await setup({ | ||
| site: FixtureSite.singleTier.onlyFreePlan | ||
| }); | ||
|
|
||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -196,7 +209,8 @@ describe('Signin', () => { | |
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
@@ -215,12 +229,12 @@ describe('Signin', () => { | |
| window.location = realLocation; | ||
| }); | ||
| test('with default settings', async () => { | ||
| const {ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, | ||
| getIframeDocument} = await multiTierSetup({ | ||
| site: FixtureSite.multipleTiers.basic | ||
| }); | ||
|
|
||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -236,17 +250,19 @@ describe('Signin', () => { | |
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
|
|
||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('without name field', async () => { | ||
| const {ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, | ||
| getIframeDocument} = await multiTierSetup({ | ||
| site: FixtureSite.multipleTiers.withoutName | ||
| }); | ||
|
|
||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -262,17 +278,19 @@ describe('Signin', () => { | |
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
|
|
||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('with only free plan available', async () => { | ||
| let {ghostApi, overlay, triggerButtonFrame, emailInput, nameInput, submitButton, | ||
| getIframeDocument} = await multiTierSetup({ | ||
| site: FixtureSite.multipleTiers.onlyFreePlan | ||
| }); | ||
|
|
||
| expect(overlay).toBeInTheDocument(); | ||
| expect(triggerButtonFrame).toBeInTheDocument(); | ||
| expect(emailInput).toBeInTheDocument(); | ||
| expect(nameInput).not.toBeInTheDocument(); | ||
|
|
@@ -288,7 +306,9 @@ describe('Signin', () => { | |
| emailType: 'signin' | ||
| }); | ||
|
|
||
| const iframeDocument = await getIframeDocument(); | ||
|
|
||
| const magicLink = await within(iframeDocument).findByText(/Now check your email/i); | ||
| expect(magicLink).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note for whoever will review this PR.
When testing signin popup, I noticed some font and paragraph changes on the page: headings font looked smaller, and there was a bigger separation between paragraphs (only when popup is open). This was caused by styles injected in the popup which were previously isolated in the iframe and now are embed in the body. I fixed the visual glitch by adding Inter font and removing parragraph bottom margin from global styles, although I am not 100% sure this was the correct approach.