2018-06-02 21:48:23 +02:00
|
|
|
var should = require('should'),
|
2017-03-21 08:24:11 +00:00
|
|
|
sinon = require('sinon'),
|
2019-06-18 15:13:55 +02:00
|
|
|
urlUtils = require('../../utils/urlUtils'),
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2017-04-24 19:21:47 +02:00
|
|
|
// Stuff we are testing
|
2020-03-30 16:26:47 +01:00
|
|
|
helpers = require('../../../core/frontend/helpers'),
|
|
|
|
common = require('../../../core/server/lib/common');
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2017-03-21 08:24:11 +00:00
|
|
|
describe('{{image}} helper', function () {
|
2017-08-27 19:06:53 +02:00
|
|
|
var logWarnStub;
|
|
|
|
|
|
|
|
beforeEach(function () {
|
2019-01-21 17:53:44 +01:00
|
|
|
logWarnStub = sinon.stub(common.logging, 'warn');
|
2017-08-27 19:06:53 +02:00
|
|
|
});
|
|
|
|
|
2014-10-21 12:50:34 +02:00
|
|
|
afterEach(function () {
|
2019-01-21 17:53:44 +01:00
|
|
|
sinon.restore();
|
2014-10-21 12:50:34 +02:00
|
|
|
});
|
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
describe('without sub-directory', function () {
|
|
|
|
let sandbox;
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
before(function () {
|
|
|
|
sandbox = sinon.createSandbox();
|
2019-08-12 09:31:42 +01:00
|
|
|
urlUtils.stubUrlUtils({url: 'http://localhost:65535/'}, sandbox);
|
2019-06-18 15:13:55 +02:00
|
|
|
});
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
after(function () {
|
|
|
|
sandbox.restore();
|
|
|
|
});
|
🐛 Fixed img-url to output relative url by default (#10596)
closes #10595
* Added breaking test for img-url helper
Input from the content API was absolute, adding this test to verify my fix
* Updated existing test to breaking test for img-url
Had made a dumb assumption when building images sizes, this updates the
test to fail so we can verify the fix
* Refactored img-url to return as early as possible
This makes it a little easier to parse what's going on, and it also
allows us to remove the check for existence of the image url in the
getImageSizes function
* Refactored img-url config parsing to clean up core logic
Superficial refactor to make future changes able to focus on what rather
than how.
* Refactored internal image detection into helper
We're gonna need to know if the image is internal or not, when we force
the path to relative, if we pull this out now, we have access in the top
level logic
* Removed duplicate checks for internal image
Cleaning up and moving "higher-level" logic into the main function of
the module
* Renamed attr -> requestedImageUrl
Superficial refactor, trying to be more explicit about identifiers
* 🐛 Fixed img-url to output relative url by default
Includes a check to isInternalImage as we never want to make external
images relative.
* Returned early if img-url recieves external url
After realising we never want to deal with external urls, we can
continue to return as early as possible, letting us remove checks and
simplify the more complex logic for internal images.
* Cleaned up the internal image logic
Defining the three functions in order helps to see what operations are
going to happen and in which order, we can then return the result of
each operation applied to the next operation.
2019-03-11 15:20:05 +01:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should output relative url of image', function () {
|
|
|
|
var rendered = helpers.img_url('/content/images/image-relative-url.png', {});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/content/images/image-relative-url.png');
|
|
|
|
logWarnStub.called.should.be.false();
|
|
|
|
});
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should output relative url of image if the input is absolute', function () {
|
2019-08-12 09:31:42 +01:00
|
|
|
var rendered = helpers.img_url('http://localhost:65535/content/images/image-relative-url.png', {});
|
2019-06-18 15:13:55 +02:00
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/content/images/image-relative-url.png');
|
|
|
|
logWarnStub.called.should.be.false();
|
|
|
|
});
|
2019-03-04 11:23:42 +01:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should output absolute url of image if the option is present ', function () {
|
|
|
|
var rendered = helpers.img_url('/content/images/image-relative-url.png', {hash: {absolute: 'true'}});
|
|
|
|
should.exist(rendered);
|
2019-08-12 09:31:42 +01:00
|
|
|
rendered.should.equal('http://localhost:65535/content/images/image-relative-url.png');
|
2019-06-18 15:13:55 +02:00
|
|
|
logWarnStub.called.should.be.false();
|
|
|
|
});
|
2014-10-21 12:50:34 +02:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should NOT output absolute url of image if the option is "false" ', function () {
|
|
|
|
var rendered = helpers.img_url('/content/images/image-relative-url.png', {hash: {absolute: 'false'}});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/content/images/image-relative-url.png');
|
|
|
|
});
|
2017-08-27 19:06:53 +02:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should output author url', function () {
|
|
|
|
var rendered = helpers.img_url('/content/images/author-image-relative-url.png', {});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/content/images/author-image-relative-url.png');
|
|
|
|
logWarnStub.called.should.be.false();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should have no output if the image attributeis not provided (with warning)', function () {
|
|
|
|
var rendered = helpers.img_url({hash: {absolute: 'true'}});
|
|
|
|
should.not.exist(rendered);
|
|
|
|
logWarnStub.calledOnce.should.be.true();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should have no output if the image attribute evaluates to undefined (with warning)', function () {
|
|
|
|
var rendered = helpers.img_url(undefined, {hash: {absolute: 'true'}});
|
|
|
|
should.not.exist(rendered);
|
|
|
|
logWarnStub.calledOnce.should.be.true();
|
|
|
|
});
|
2014-12-28 19:38:29 +00:00
|
|
|
|
2019-06-18 15:13:55 +02:00
|
|
|
it('should have no output if the image attribute evaluates to null (no waring)', function () {
|
|
|
|
var rendered = helpers.img_url(null, {hash: {absolute: 'true'}});
|
|
|
|
should.not.exist(rendered);
|
|
|
|
logWarnStub.calledOnce.should.be.false();
|
|
|
|
});
|
2014-10-21 12:50:34 +02:00
|
|
|
});
|
2014-11-17 03:38:10 +00:00
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
describe('with sub-directory', function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
let sandbox;
|
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
before(function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
sandbox = sinon.createSandbox();
|
2019-08-12 09:31:42 +01:00
|
|
|
urlUtils.stubUrlUtils({url: 'http://localhost:65535/blog'}, sandbox);
|
2015-12-14 20:05:11 +00:00
|
|
|
});
|
2019-06-18 15:13:55 +02:00
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
after(function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
sandbox.restore();
|
2015-12-14 20:05:11 +00:00
|
|
|
});
|
2014-11-17 03:38:10 +00:00
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
it('should output relative url of image', function () {
|
2017-04-24 19:21:47 +02:00
|
|
|
var rendered = helpers.img_url('/blog/content/images/image-relative-url.png', {});
|
2015-12-14 20:05:11 +00:00
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/blog/content/images/image-relative-url.png');
|
2014-12-28 19:38:29 +00:00
|
|
|
});
|
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
it('should output absolute url of image if the option is present ', function () {
|
2017-04-24 19:21:47 +02:00
|
|
|
var rendered = helpers.img_url('/blog/content/images/image-relative-url.png', {hash: {absolute: 'true'}});
|
2015-12-14 20:05:11 +00:00
|
|
|
should.exist(rendered);
|
2019-08-12 09:31:42 +01:00
|
|
|
rendered.should.equal('http://localhost:65535/blog/content/images/image-relative-url.png');
|
2014-12-28 19:38:29 +00:00
|
|
|
});
|
|
|
|
|
2015-12-14 20:05:11 +00:00
|
|
|
it('should not change output for an external url', function () {
|
2017-04-24 19:21:47 +02:00
|
|
|
var rendered = helpers.img_url('http://example.com/picture.jpg', {});
|
2015-12-14 20:05:11 +00:00
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('http://example.com/picture.jpg');
|
2014-12-28 19:38:29 +00:00
|
|
|
});
|
2014-12-02 14:24:51 +00:00
|
|
|
});
|
2018-12-13 19:14:08 +07:00
|
|
|
|
|
|
|
describe('image_sizes', function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
let sandbox;
|
|
|
|
|
2018-12-13 19:14:08 +07:00
|
|
|
before(function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
sandbox = sinon.createSandbox();
|
2019-08-12 09:31:42 +01:00
|
|
|
urlUtils.stubUrlUtils({url: 'http://localhost:65535/'}, sandbox);
|
2018-12-13 19:14:08 +07:00
|
|
|
});
|
2019-06-18 15:13:55 +02:00
|
|
|
|
2018-12-13 19:14:08 +07:00
|
|
|
after(function () {
|
2019-06-18 15:13:55 +02:00
|
|
|
sandbox.restore();
|
2018-12-13 19:14:08 +07:00
|
|
|
});
|
2019-06-18 15:13:55 +02:00
|
|
|
|
2018-12-13 19:14:08 +07:00
|
|
|
it('should output correct url for absolute paths which are internal', function () {
|
2019-08-12 09:31:42 +01:00
|
|
|
var rendered = helpers.img_url('http://localhost:65535/content/images/my-coole-img.jpg', {
|
2018-12-13 19:14:08 +07:00
|
|
|
hash: {
|
2019-07-05 13:40:43 +02:00
|
|
|
size: 'medium'
|
2018-12-13 19:14:08 +07:00
|
|
|
},
|
|
|
|
data: {
|
|
|
|
config: {
|
|
|
|
image_sizes: {
|
|
|
|
medium: {
|
|
|
|
width: 400
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
should.exist(rendered);
|
🐛 Fixed img-url to output relative url by default (#10596)
closes #10595
* Added breaking test for img-url helper
Input from the content API was absolute, adding this test to verify my fix
* Updated existing test to breaking test for img-url
Had made a dumb assumption when building images sizes, this updates the
test to fail so we can verify the fix
* Refactored img-url to return as early as possible
This makes it a little easier to parse what's going on, and it also
allows us to remove the check for existence of the image url in the
getImageSizes function
* Refactored img-url config parsing to clean up core logic
Superficial refactor to make future changes able to focus on what rather
than how.
* Refactored internal image detection into helper
We're gonna need to know if the image is internal or not, when we force
the path to relative, if we pull this out now, we have access in the top
level logic
* Removed duplicate checks for internal image
Cleaning up and moving "higher-level" logic into the main function of
the module
* Renamed attr -> requestedImageUrl
Superficial refactor, trying to be more explicit about identifiers
* 🐛 Fixed img-url to output relative url by default
Includes a check to isInternalImage as we never want to make external
images relative.
* Returned early if img-url recieves external url
After realising we never want to deal with external urls, we can
continue to return as early as possible, letting us remove checks and
simplify the more complex logic for internal images.
* Cleaned up the internal image logic
Defining the three functions in order helps to see what operations are
going to happen and in which order, we can then return the result of
each operation applied to the next operation.
2019-03-11 15:20:05 +01:00
|
|
|
rendered.should.equal('/content/images/size/w400/my-coole-img.jpg');
|
2019-01-21 11:41:23 +01:00
|
|
|
});
|
|
|
|
it('should output the correct url for protocol relative urls', function () {
|
|
|
|
var rendered = helpers.img_url('//website.com/whatever/my-coole-img.jpg', {
|
|
|
|
hash: {
|
2019-07-05 13:40:43 +02:00
|
|
|
size: 'medium'
|
2019-01-21 11:41:23 +01:00
|
|
|
},
|
|
|
|
data: {
|
|
|
|
config: {
|
|
|
|
image_sizes: {
|
|
|
|
medium: {
|
|
|
|
width: 400
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('//website.com/whatever/my-coole-img.jpg');
|
|
|
|
});
|
2018-12-13 19:14:08 +07:00
|
|
|
it('should output the correct url for relative paths', function () {
|
|
|
|
var rendered = helpers.img_url('/content/images/my-coole-img.jpg', {
|
|
|
|
hash: {
|
2019-07-05 13:40:43 +02:00
|
|
|
size: 'medium'
|
2018-12-13 19:14:08 +07:00
|
|
|
},
|
|
|
|
data: {
|
|
|
|
config: {
|
|
|
|
image_sizes: {
|
|
|
|
medium: {
|
|
|
|
width: 400
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('/content/images/size/w400/my-coole-img.jpg');
|
|
|
|
});
|
2019-07-29 16:54:09 +08:00
|
|
|
|
|
|
|
it('should output the correct url for relative paths without leading slash', function () {
|
|
|
|
var rendered = helpers.img_url('content/images/my-coole-img.jpg', {
|
|
|
|
hash: {
|
|
|
|
size: 'medium'
|
|
|
|
},
|
|
|
|
data: {
|
|
|
|
config: {
|
|
|
|
image_sizes: {
|
|
|
|
medium: {
|
|
|
|
width: 400
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
should.exist(rendered);
|
|
|
|
rendered.should.equal('content/images/size/w400/my-coole-img.jpg');
|
|
|
|
});
|
2018-12-13 19:14:08 +07:00
|
|
|
});
|
2014-11-17 03:38:10 +00:00
|
|
|
});
|