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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@puzzle-js/client-lib",
"main": "dist/index.js",
"version": "1.6.1",
"version": "1.6.2",
"author": "<emre.kul@trendyol.com>",
"license": "MIT",
"repository": {
Expand Down
17 changes: 16 additions & 1 deletion src/assetHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export class AssetHelper {
scriptTag.onload = () => {
this.promises[asset.name].resolve();
};

scriptTag.onerror = () => {
this.promises[asset.name].reject();
};
} else {
this.promises[asset.name].resolve();
}
Expand All @@ -58,6 +62,9 @@ export class AssetHelper {
linkTag.onload = () => {
this.promises[asset.name].resolve();
};
linkTag.onerror = () => {
this.promises[asset.name].reject();
};

window.document.head.appendChild(linkTag);
}
Expand All @@ -71,24 +78,32 @@ export class AssetHelper {
}

for (let i = 0, p: any = Promise.resolve(); i < assets.length; i++) {
p = p.then(() => new Promise(resolve => {
p = p.then(() => new Promise((resolve, reject) => {
const asset = assets[i];
if (asset.type === RESOURCE_TYPE.JS) {
const assetLoading = AssetHelper.loadJs(asset);
assetLoading.then(() => {
resolve(null);
}).catch(() => {
reject(null);
});
} else if (asset.type === RESOURCE_TYPE.CSS) {
const assetLoading = AssetHelper.loadCSS(asset);
assetLoading.then(() => {
resolve(null);
}).catch(() => {
reject(null);
});
}
}
)).then(() => {
if (callback && assets.length - 1 === i) {
callback();
}
}).catch(() => {
if (callback && assets.length - 1 === i) {
callback();
}
});
}
}
Expand Down
59 changes: 59 additions & 0 deletions test/assetHelper.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,65 @@ describe('Module - Asset Helper', () => {
});
});

it('should call given callback when js asset has an error', async (done) => {
// arrange
const spy = sinon.spy();
const assets: IPageLibAsset[] = [
{
name: faker.lorem.word(),
loadMethod: RESOURCE_LOADING_TYPE.ON_FRAGMENT_RENDER,
fragment: faker.lorem.word(),
dependent: [],
type: RESOURCE_TYPE.JS,
link: faker.lorem.word(),
preLoaded: false,
defer: true,
}
];

// act
await AssetHelper.loadAssetSeries(assets, spy);

AssetHelper.promises[assets[0].name].reject();

// assert
expect(global.window.document.body.children.length).to.eq(1);

setTimeout(() => {
expect(spy.calledOnce).to.eq(true);
done();
});
});

it('should call given callback when css asset has an error', async (done) => {
// arrange
const spy = sinon.spy();
const assets: IPageLibAsset[] = [
{
name: faker.lorem.word(),
loadMethod: RESOURCE_LOADING_TYPE.ON_FRAGMENT_RENDER,
fragment: faker.lorem.word(),
dependent: [],
type: RESOURCE_TYPE.CSS,
link: faker.lorem.word(),
preLoaded: false
}
];

// act
await AssetHelper.loadAssetSeries(assets, spy);

AssetHelper.promises[assets[0].name].reject();

// assert
expect(global.window.document.head.children.length).to.eq(1);

setTimeout(() => {
expect(spy.calledOnce).to.eq(true);
done();
});
});

it('should call given callback if assets length is 0', async (done) => {
// arrange
const spy = sinon.spy();
Expand Down