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

Instantiate the amp-story element only once per test. #18142

Merged
merged 1 commit into from Sep 18, 2018
Merged

Instantiate the amp-story element only once per test. #18142

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 3 additions & 56 deletions extensions/amp-story/1.0/test/test-amp-story.js
View file
Open in desktop
Expand Up @@ -108,11 +108,9 @@ describes.realWin('amp-story', {

AmpStory.isBrowserSupported = () => true;

story = new AmpStory(element);
// TODO(alanorozco): Test active page event triggers once the stubbable
// `Services` module is part of the amphtml-story repo.
// sandbox.stub(element.implementation_,
// 'triggerActiveEventForPage_').callsFake(NOOP);
return element.getImpl().then(impl => {
story = impl;
});
});

afterEach(() => {
Expand Down Expand Up @@ -293,7 +291,6 @@ describes.realWin('amp-story', {

it('lock body when amp-story is initialized', () => {
createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -308,7 +305,6 @@ describes.realWin('amp-story', {

it('builds and attaches pagination buttons ', () => {
createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand Down Expand Up @@ -372,7 +368,6 @@ describes.realWin('amp-story', {
const pageCount = 2;
createPages(story.element, pageCount, [firstPageId, 'page-1']);

story.buildCallback();
return story.layoutCallback()
.then(() => {
return expect(replaceStateStub).to.have.been.calledWith(
Expand All @@ -390,7 +385,6 @@ describes.realWin('amp-story', {
const firstPage = pages[0];
firstPage.setAttribute('ad', '');

story.buildCallback();
return story.layoutCallback()
.then(() => {
return expect(replaceStateStub).to.not.have.been.called;
Expand All @@ -401,7 +395,6 @@ describes.realWin('amp-story', {
createPages(story.element, 2, ['cover', 'page-1']);

story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand Down Expand Up @@ -431,8 +424,6 @@ describes.realWin('amp-story', {
const promise = new Promise(() => {});
sandbox.stub(consent, 'getConsentPolicyState').returns(promise);

story.buildCallback();

const coverEl = element.querySelector('amp-story-page');
let setStateStub;

Expand Down Expand Up @@ -475,8 +466,6 @@ describes.realWin('amp-story', {

sandbox.stub(consent, 'getConsentPolicyState').returns(promise);

story.buildCallback();

const coverEl = element.querySelector('amp-story-page');
let setStateStub;

Expand Down Expand Up @@ -518,8 +507,6 @@ describes.realWin('amp-story', {
// rejected the consent in a previous session.
sandbox.stub(consent, 'getConsentPolicyState').resolves();

story.buildCallback();

const coverEl = element.querySelector('amp-story-page');
let setStateStub;

Expand Down Expand Up @@ -590,8 +577,6 @@ describes.realWin('amp-story', {
it('should pause the story when viewer becomes inactive', () => {
createPages(story.element, 2, ['cover', 'page-1']);

story.buildCallback();

return story.layoutCallback()
.then(() => {
story.pauseCallback();
Expand All @@ -605,8 +590,6 @@ describes.realWin('amp-story', {

story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);

story.buildCallback();

return story.layoutCallback()
.then(() => {
story.resumeCallback();
Expand All @@ -620,8 +603,6 @@ describes.realWin('amp-story', {

story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);

story.buildCallback();

return story.layoutCallback()
.then(() => {
story.pauseCallback();
Expand All @@ -638,7 +619,6 @@ describes.realWin('amp-story', {
story = new AmpStory(element);
const dispatchStub = sandbox.stub(story.storeService_, 'dispatch');
createPages(story.element, 2, ['cover', 'page-4']);
story.buildCallback();
return story.layoutCallback()
.then(() => {
expect(dispatchStub).to.have.been.calledWith(
Expand All @@ -648,17 +628,13 @@ describes.realWin('amp-story', {
});

it('should display the story after clicking "continue" button', () => {

AmpStory.isBrowserSupported = () => false;
story = new AmpStory(element);
const dispatchStub = sandbox.stub(
story.unsupportedBrowserLayer_.storeService_, 'dispatch');
createPages(story.element, 2, ['cover', 'page-1']);

story.buildCallback();
//story.layoutCallback();

//story.unsupportedBrowserLayer_.continueButton_.click();

return story.layoutCallback()
.then(() => {
Expand All @@ -680,7 +656,6 @@ describes.realWin('amp-story', {

const pages = createPages(story.element, 2, ['page-0', 'page-1']);
const page1 = pages[1];
story.buildCallback();
return story.layoutCallback()
.then(() => {
expect(page1.hasAttribute('i-amphtml-next-page')).to.be.true;
Expand All @@ -694,7 +669,6 @@ describes.realWin('amp-story', {

const pages = createPages(story.element, 2, ['page-0', 'page-1']);
const page0 = pages[0];
story.buildCallback();
return story.layoutCallback()
.then(() => story.switchTo_('page-1'))
.then(() => {
Expand All @@ -709,7 +683,6 @@ describes.realWin('amp-story', {

const pages = createPages(story.element, 2, ['page-0', 'page-1']);
const page0 = pages[0];
story.buildCallback();
return story.layoutCallback()
.then(() => story.switchTo_('page-1'))
.then(() => {
Expand All @@ -727,8 +700,6 @@ describes.realWin('amp-story', {

createPages(story.element, 2, ['cover', 'page-1']);

story.buildCallback();

return story.layoutCallback()
.then(() => {
expect(story.backgroundAudioEl_).to.exist;
Expand All @@ -743,7 +714,6 @@ describes.realWin('amp-story', {
sandbox.stub(story.mediaPool_, 'blessAll').resolves();

createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -758,7 +728,6 @@ describes.realWin('amp-story', {
story.backgroundAudioEl_ = backgroundAudioEl;

createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();
return story.layoutCallback()
.then(() => {
const pauseStub = sandbox.stub(story.mediaPool_, 'pause');
Expand All @@ -777,7 +746,6 @@ describes.realWin('amp-story', {
story.backgroundAudioEl_ = backgroundAudioEl;

createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -803,7 +771,6 @@ describes.realWin('amp-story', {
story.backgroundAudioEl_ = backgroundAudioEl;

createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -823,7 +790,6 @@ describes.realWin('amp-story', {
createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);

story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
story.buildCallback();

let coverMuteStub;
let firstPageUnmuteStub;
Expand All @@ -846,7 +812,6 @@ describes.realWin('amp-story', {
describe('#getMaxMediaElementCounts', () => {
it('should create 2 audio & video elements when no elements found', () => {
createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -862,7 +827,6 @@ describes.realWin('amp-story', {

it('should create 2 extra audio & video elements for ads', () => {
createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -880,7 +844,6 @@ describes.realWin('amp-story', {

it('never have more than the defined maximums', () => {
createPages(story.element, 2, ['cover', 'page-1']);
story.buildCallback();

return story.layoutCallback()
.then(() => {
Expand All @@ -903,8 +866,6 @@ describes.realWin('amp-story', {
it('should set the access state to true if next page blocked', () => {
createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);

story.buildCallback();

return story.layoutCallback()
.then(() => {
story.getPageById('page-1')
Expand All @@ -920,8 +881,6 @@ describes.realWin('amp-story', {
it('should not navigate if next page is blocked by paywall', () => {
createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);

story.buildCallback();

return story.layoutCallback()
.then(() => {
story.getPageById('page-1')
Expand All @@ -944,8 +903,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigates to a paywall protected page, and waits until the document
// is successfuly reauthorized to navigate.
return story.layoutCallback()
Expand Down Expand Up @@ -974,8 +931,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigates to a paywall protected page, and waits until the document
// is successfuly reauthorized to hide the access UI.
return story.layoutCallback()
Expand Down Expand Up @@ -1006,8 +961,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigates to a paywall protected page, and does not navigate to that
// page if the document has been reauthorized with insuficient rights.
return story.layoutCallback()
Expand All @@ -1034,8 +987,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigates to a paywall protected page, and does not hide the access UI
// if the document has been reauthorized with insuficient rights.
return story.layoutCallback()
Expand All @@ -1062,8 +1013,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigates to a maybe protected page (has amp-access="" rule), but the
// document authorizations are still pending. Asserts that it blocks the
// navigation.
Expand All @@ -1089,8 +1038,6 @@ describes.realWin('amp-story', {
sandbox.stub(Services, 'accessServiceForDocOrNull')
.resolves(fakeAccessService);

story.buildCallback();

// Navigation to a maybe protected page (has amp-access="" rule) is
// blocked until the authorizations are completed.
return story.layoutCallback()
Expand Down