From 32dd4574afa72f82a55d73f12be7acb230a1fedd Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 16 Jun 2020 20:58:02 +0100 Subject: [PATCH] Fixed non-reverted rewire of imageSize.getImageSizeFromUrl in tests no issue - fixes unexpected behaviour in tests run after the `cached-image-size-from-url_spec.js` unit tests --- test/unit/lib/image/cached-image-size-from-url_spec.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/unit/lib/image/cached-image-size-from-url_spec.js b/test/unit/lib/image/cached-image-size-from-url_spec.js index 9d6dba3c8e..88fd1c0882 100644 --- a/test/unit/lib/image/cached-image-size-from-url_spec.js +++ b/test/unit/lib/image/cached-image-size-from-url_spec.js @@ -9,6 +9,7 @@ const getCachedImageSizeFromUrl = rewire('../../../../core/server/lib/image/cach describe('lib/image: image size cache', function () { let sizeOfStub; let cachedImagedSize; + let revertGetCachedImageSizeFromUrl; beforeEach(function () { sizeOfStub = sinon.stub(); @@ -17,6 +18,10 @@ describe('lib/image: image size cache', function () { afterEach(function () { sinon.restore(); getCachedImageSizeFromUrl.__set__('cache', {}); + + if (revertGetCachedImageSizeFromUrl) { + revertGetCachedImageSizeFromUrl(); + } }); it('should read from cache, if dimensions for image are fetched already', function (done) { @@ -30,7 +35,7 @@ describe('lib/image: image size cache', function () { type: 'jpg' })); - getCachedImageSizeFromUrl.__set__('imageSize.getImageSizeFromUrl', sizeOfStub); + revertGetCachedImageSizeFromUrl = getCachedImageSizeFromUrl.__set__('imageSize.getImageSizeFromUrl', sizeOfStub); imageSizeSpy = getCachedImageSizeFromUrl.__get__('imageSize.getImageSizeFromUrl'); @@ -69,7 +74,7 @@ describe('lib/image: image size cache', function () { sizeOfStub.returns(new Promise.reject('error')); - getCachedImageSizeFromUrl.__set__('imageSize.getImageSizeFromUrl', sizeOfStub); + revertGetCachedImageSizeFromUrl = getCachedImageSizeFromUrl.__set__('imageSize.getImageSizeFromUrl', sizeOfStub); cachedImagedSizeResult = Promise.resolve(getCachedImageSizeFromUrl(url)); cachedImagedSizeResult.then(function () {