-
Notifications
You must be signed in to change notification settings - Fork 230
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.
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
[NASAA-203/204] - Create AmpExperiment component, add top stories experiment to PS articles #12048
Merged
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
9a2290e
Create AmpExperiment component
hotinglok cdd54dd
Update tests
hotinglok bdd3edd
Implement front-end changes
hotinglok a215780
Refactor various logic
hotinglok a4b4188
Fix urn bug
hotinglok b11f47a
Refactor various logic, add tests
hotinglok 739314b
Refactor block insertion logic, add article page tests
hotinglok db2b3ff
Update block insertion tests
hotinglok 8f709d0
Merge branch 'latest' into nasaa-create-amp-experiment
hotinglok bcc34e5
Fix urn retrieval function
hotinglok 6aae312
Minor cleanup
hotinglok 3be6ae5
Minor cleanup
hotinglok cfe5254
Rename, move, update various files and variables
hotinglok 3e46a76
Apply suggestions from code review
hotinglok 1725aa5
Use id instead of pathname for urn
hotinglok 1c4c59a
fix confflicts
hotinglok 4689617
fix tests
hotinglok cf7a1f1
Linting
hotinglok 68d5932
Refactor helper functions
hotinglok 1674d2e
Fix test
hotinglok 43f903c
Fix accidentally removed check in getExperimentTopStoriesBlocks()
hotinglok 92a84f8
Linting
hotinglok 5bacd6f
Update src/app/components/AmpExperiment/index.tsx
hotinglok a031332
Rename getExperimentTopStoriesBlocks to getExperimentTopStories
hotinglok 31fbb08
Add article length condition to getExperimentTopStories()
hotinglok 42ad63a
Update helpers test
hotinglok bf3c63e
Merge branch 'latest' into nasaa-create-amp-experiment
hotinglok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
import React from 'react'; | ||
import { render, waitFor } from '../react-testing-library-with-providers'; | ||
import AmpExperiment from './index'; | ||
|
||
const experimentConfig = { | ||
someExperiment: { | ||
variants: { | ||
control: 33, | ||
variant_1: 33, | ||
variant_2: 33, | ||
}, | ||
}, | ||
}; | ||
|
||
const multipleExperimentConfig = { | ||
aExperiment: { | ||
variants: { | ||
control: 33, | ||
variant_1: 33, | ||
variant_2: 33, | ||
}, | ||
}, | ||
bExperiment: { | ||
variants: { | ||
control: 33, | ||
variant_1: 33, | ||
variant_2: 33, | ||
}, | ||
}, | ||
}; | ||
|
||
describe('Amp experiment container on Amp pages', () => { | ||
it('should render an amp-experiment with the expected config', async () => { | ||
const { container } = render( | ||
<AmpExperiment experimentConfig={experimentConfig} />, | ||
); | ||
expect(container.querySelector('amp-experiment')).toBeInTheDocument(); | ||
expect(container).toMatchInlineSnapshot(` | ||
<div> | ||
<amp-experiment> | ||
<script | ||
type="application/json" | ||
> | ||
{"someExperiment":{"variants":{"control":33,"variant_1":33,"variant_2":33}}} | ||
</script> | ||
</amp-experiment> | ||
</div> | ||
`); | ||
}); | ||
|
||
it('should render an amp-experiment with the expected config when multiple experiments are running at the same time', async () => { | ||
const { container } = render( | ||
<AmpExperiment experimentConfig={multipleExperimentConfig} />, | ||
); | ||
expect(container.querySelector('amp-experiment')).toBeInTheDocument(); | ||
expect(container).toMatchInlineSnapshot(` | ||
<div> | ||
<amp-experiment> | ||
<script | ||
type="application/json" | ||
> | ||
{"aExperiment":{"variants":{"control":33,"variant_1":33,"variant_2":33}},"bExperiment":{"variants":{"control":33,"variant_1":33,"variant_2":33}}} | ||
</script> | ||
</amp-experiment> | ||
</div> | ||
`); | ||
}); | ||
|
||
it(`should add amp-experiment extension script to page head`, async () => { | ||
render(<AmpExperiment experimentConfig={experimentConfig} />); | ||
|
||
await waitFor(() => { | ||
const scripts = Array.from(document.querySelectorAll('head script')); | ||
|
||
expect(scripts).toEqual( | ||
expect.arrayContaining([ | ||
expect.objectContaining({ | ||
src: `https://cdn.ampproject.org/v0/amp-experiment-0.1.js`, | ||
}), | ||
]), | ||
); | ||
|
||
expect(scripts).toHaveLength(1); | ||
}); | ||
}); | ||
}); |
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 |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/** @jsx jsx */ | ||
/* @jsxFrag React.Fragment */ | ||
import { jsx } from '@emotion/react'; | ||
import React from 'react'; | ||
import { Helmet } from 'react-helmet'; | ||
|
||
type Variant = string; | ||
type Experiment = string; | ||
type TrafficAllocationPercentage = number; | ||
|
||
type AmpExperimentConfig = { | ||
[key: Experiment]: { | ||
sticky?: boolean; | ||
consentNotificationId?: string; | ||
variants: { | ||
[key: Variant]: TrafficAllocationPercentage; | ||
}; | ||
}; | ||
}; | ||
|
||
type AmpExperimentProps = { | ||
[key: Experiment]: AmpExperimentConfig; | ||
}; | ||
|
||
const AmpHead = () => ( | ||
<Helmet> | ||
<script | ||
async | ||
custom-element="amp-experiment" | ||
src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" | ||
/> | ||
</Helmet> | ||
); | ||
|
||
const AmpExperiment = ({ experimentConfig }: AmpExperimentProps) => { | ||
return ( | ||
<> | ||
<AmpHead /> | ||
<amp-experiment> | ||
<script | ||
type="application/json" | ||
/* eslint-disable-next-line react/no-danger */ | ||
dangerouslySetInnerHTML={{ __html: JSON.stringify(experimentConfig) }} | ||
/> | ||
</amp-experiment> | ||
</> | ||
); | ||
}; | ||
|
||
export default AmpExperiment; |
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 |
---|---|---|
@@ -0,0 +1,7 @@ | ||
declare namespace JSX { | ||
interface IntrinsicElements { | ||
'amp-experiment': React.PropsWithChildren< | ||
ScriptHTMLAttributes<HTMLScriptElement> | ||
>; | ||
} | ||
} |
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
109 changes: 109 additions & 0 deletions
109
src/app/pages/ArticlePage/experimentTopStories/helpers.test.tsx
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 |
---|---|---|
@@ -0,0 +1,109 @@ | ||
import { getExperimentTopStories } from './helpers'; | ||
import { topStoriesList } from '../PagePromoSections/TopStoriesSection/fixture/index'; | ||
|
||
describe('AMP top stories experiment', () => { | ||
const mockTextBlock = { | ||
type: 'text', | ||
model: { | ||
blocks: [], | ||
}, | ||
}; | ||
const expectedExperimentTopStoriesBlock = (index: number) => { | ||
return { | ||
type: 'experimentTopStories', | ||
model: topStoriesList, | ||
id: `experimentTopStories-${index}`, | ||
}; | ||
}; | ||
|
||
const blocksShortLength = [mockTextBlock]; | ||
|
||
const blocksEvenLength = [ | ||
mockTextBlock, | ||
mockTextBlock, | ||
mockTextBlock, | ||
mockTextBlock, | ||
]; | ||
const blocksOddLength = [mockTextBlock, mockTextBlock, mockTextBlock]; | ||
|
||
describe('getExperimentTopStories()', () => { | ||
it('returns shouldEnableExperimentTopStories as true if props match conditions.', () => { | ||
const { shouldEnableExperimentTopStories } = getExperimentTopStories({ | ||
blocks: blocksEvenLength, | ||
topStoriesContent: topStoriesList, | ||
isAmp: true, | ||
id: 'c6v11qzyv8po', | ||
service: 'news', | ||
}); | ||
expect(shouldEnableExperimentTopStories).toBe(true); | ||
}); | ||
|
||
it.each` | ||
testDescription | isAmp | id | service | ||
${'all props are undefined'} | ${false} | ${undefined} | ${undefined} | ||
${'only isAmp is true'} | ${true} | ${undefined} | ${undefined} | ||
${'only pathname is undefined'} | ${true} | ${undefined} | ${'news'} | ||
${'only pathname is defined and valid'} | ${false} | ${'c6v11qzyv8po'} | ${undefined} | ||
${'all props defined but pathname is invalid'} | ${false} | ${'c1231qzyv8po'} | ${undefined} | ||
${'only service is undefined'} | ${true} | ${'c6v11qzyv8po'} | ${undefined} | ||
${'only service is defined and valid'} | ${false} | ${undefined} | ${'news'} | ||
${'all props defined but service is invalid'} | ${true} | ${'c6v11qzyv8po'} | ${'igbo'} | ||
`( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Impressive I like that |
||
'returns shouldEnableExperimentTopStories as false because $testDescription.', | ||
({ isAmp, id, service }) => { | ||
const { shouldEnableExperimentTopStories } = getExperimentTopStories({ | ||
blocks: blocksEvenLength, | ||
topStoriesContent: topStoriesList, | ||
isAmp, | ||
id, | ||
service, | ||
}); | ||
|
||
expect(shouldEnableExperimentTopStories).toBe(false); | ||
}, | ||
); | ||
|
||
const expectedBlocksEvenLength = [ | ||
mockTextBlock, | ||
mockTextBlock, | ||
expectedExperimentTopStoriesBlock(2), | ||
mockTextBlock, | ||
mockTextBlock, | ||
]; | ||
const expectedBlocksOddLength = [ | ||
mockTextBlock, | ||
expectedExperimentTopStoriesBlock(1), | ||
mockTextBlock, | ||
mockTextBlock, | ||
]; | ||
|
||
it.each` | ||
testType | inputBlocks | expectedOutput | ||
${'even'} | ${blocksEvenLength} | ${expectedBlocksEvenLength} | ||
${'odd'} | ${blocksOddLength} | ${expectedBlocksOddLength} | ||
`( | ||
'should insert experimentTopStories block into blocks array in the correct position when blocks.length is $testType', | ||
({ inputBlocks, expectedOutput }) => { | ||
const { transformedBlocks } = getExperimentTopStories({ | ||
blocks: inputBlocks, | ||
topStoriesContent: topStoriesList, | ||
isAmp: true, | ||
id: 'c6v11qzyv8po', | ||
service: 'news', | ||
}); | ||
expect(transformedBlocks).toEqual(expectedOutput); | ||
}, | ||
); | ||
|
||
it('does not insert experiment top stories blocks if the blocks array length is < 2.', () => { | ||
const { transformedBlocks } = getExperimentTopStories({ | ||
blocks: blocksShortLength, | ||
topStoriesContent: topStoriesList, | ||
isAmp: true, | ||
id: 'c6v11qzyv8po', | ||
service: 'news', | ||
}); | ||
expect(transformedBlocks).toBe(blocksShortLength); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.
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.
I'm a bit confused on what's happening here. Does this always add in the experiment?
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.
I think it might be. This was flagged by a TS error I get on line 102
Right operand of ?? is unreachable because the left operand is never nullish.
If I add something in like the below on line 205 then the unit tests pass
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.
I think the function now returns either the blocks unchanged or the experimentally changes to the blocks. This should probably be made more clear by updating the name of the function to de-couple it from experimentation. i.e
getExperimentTopStoriesBlocks
should really begetTopStoriesBlocks
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.
Sorry that was just me being careless. You're right about the fix, I moved around a few things in the last refactor and completely left the check out. Re-added, should make sense now. Also missed some more renaming, but should be good now!
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.
@iainrj I've kept the name
getExperimentTopStoriesBlocks
since it doesn't get the data for the originalTopStoriesSection
in the secondary column and because the top stories blocks in the article blocks array havetype: experimentTopStories
.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.
Nice one, thanks :)