Skip to content

Commit

Permalink
Change fit to cover for asLeastAsLarge
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyZhang777 committed Jan 18, 2024
1 parent 0c125fa commit 3e6284f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion static/js/formatters-internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ function _getEuImageDynamicUrl(image, desiredSize, atLeastAsLarge) {
formatOptions.push(`height=${fullSizeHeight}`);
}

formatOptions.push(`fit=${atLeastAsLarge ? 'pad' : 'contain'}`);
formatOptions.push(`fit=${atLeastAsLarge ? 'cover' : 'contain'}`);

const urlWithOptions = image.url + `/${formatOptions.join(',')}`;

Expand Down
12 changes: 6 additions & 6 deletions tests/static/js/formatters-internal/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@ describe('image formatter', () => {
const usImageUrl = Formatters.image(usImg).url;
expect(usImageUrl).toEqual('https://dynl.mktgcdn.com/p/200x1.jpg');
const euImageUrl = Formatters.image(euImg).url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=200,fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=200,fit=cover');
});

it('Can restrict the dimensions by width', () => {
const usImageUrl = Formatters.image(usImg, '601x').url;
expect(usImageUrl).toEqual('https://dynl.mktgcdn.com/p/601x1.jpg');
const euImageUrl = Formatters.image(euImg, '601x').url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=601,fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=601,fit=cover');
});

it('Can restrict the dimensions by height', () => {
const usImageUrl = Formatters.image(usImg, 'x338').url;
expect(usImageUrl).toEqual('https://dynl.mktgcdn.com/p/1x338.jpg');
const euImageUrl = Formatters.image(euImg, 'x338').url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/height=338,fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/height=338,fit=cover');
});

it('Can restrict by both dimensions', () => {
const usImageUrl = Formatters.image(usImg, '601x338').url;
expect(usImageUrl).toEqual('https://dynl.mktgcdn.com/p/601x338.jpg');
const euImageUrl = Formatters.image(euImg, '601x338').url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=601,height=338,fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/width=601,height=338,fit=cover');
});

it('returns the smallest image when no dimensions given', () => {
const usImageUrl = Formatters.image(usImg, 'x').url;
expect(usImageUrl).toEqual('https://dynl.mktgcdn.com/p/1x1.jpg');
const euImageUrl = Formatters.image(euImg, 'x').url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/fit=cover');
});
});

Expand Down Expand Up @@ -100,7 +100,7 @@ describe('image formatter', () => {

it('when choosing the smallest image over threshold, omit width/height if can\'t parse it from the image object', () => {
const euImageUrl = Formatters.image({url: euUrl}, 'x', true).url;
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/fit=pad');
expect(euImageUrl).toEqual('https://dyn.eu.mktgcdn.com/f/0/FOO.jpg/fit=cover');
});
});
});

0 comments on commit 3e6284f

Please sign in to comment.