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
6 changes: 6 additions & 0 deletions __tests__/asset-css.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const { validate } = require('@podium/schemas');
const Css = require('../lib/asset-css');

test('Css() - object tag - should be PodiumAssetCss', () => {
Expand Down Expand Up @@ -342,3 +343,8 @@ test('Css() - set "href" - should throw', () => {
obj.href = '/bar';
}).toThrowError('Cannot set read-only property.');
});

test('Css() - validate object against schema - should validate', () => {
const obj = new Css({ value: '/foo' });
expect(validate.css([obj]).error).toEqual(false);
});
6 changes: 6 additions & 0 deletions __tests__/asset-js.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const { validate } = require('@podium/schemas');
const Js = require('../lib/asset-js');

test('Js() - object tag - should be PodiumAssetJs', () => {
Expand Down Expand Up @@ -326,3 +327,8 @@ test('Js() - set "src" - should throw', () => {
obj.src = '/bar';
}).toThrowError('Cannot set read-only property.');
});

test('Js() - validate object against schema - should validate', () => {
const obj = new Js({ value: '/foo' });
expect(validate.js([obj]).error).toEqual(false);
});
3 changes: 1 addition & 2 deletions lib/asset-css.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';

const { validate } = require('@podium/schemas');
const { uriIsRelative, pathnameBuilder } = require('./utils');
const { buildLinkElement } = require('./html-utils');

Expand Down Expand Up @@ -39,7 +38,7 @@ const PodiumAssetCss = class PodiumAssetCss {
rel = 'stylesheet',
as = '',
} = {}) {
if (validate.css(value).error)
if (!toUndefined(value))
throw new Error(
`Value for argument variable "value", "${value}", is not valid`,
);
Expand Down
5 changes: 2 additions & 3 deletions lib/asset-js.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';

const { validate } = require('@podium/schemas');
const { uriIsRelative, pathnameBuilder } = require('./utils');
const { buildScriptElement } = require('./html-utils');

Expand Down Expand Up @@ -40,11 +39,11 @@ const PodiumAssetJs = class PodiumAssetJs {
type = 'default',
data = [],
} = {}) {
if (validate.js(value).error)
if (!toUndefined(value))
throw new Error(
`Value for argument variable "value", "${value}", is not valid`,
);

this[_pathname] = pathname;
this[_prefix] = prefix;
this[_value] = value;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"@semantic-release/npm": "7.0.5",
"@semantic-release/release-notes-generator": "9.0.1",
"semantic-release": "17.1.1",
"@podium/schemas": "5.0.0-next.1",
"benchmark": "2.1.4",
"eslint": "7.3.1",
"eslint-config-airbnb-base": "14.2.0",
Expand All @@ -67,7 +68,6 @@
"prettier": "2.0.2"
},
"dependencies": {
"@podium/schemas": "4.0.2",
"original-url": "1.2.3",
"camelcase": "6.0.0"
}
Expand Down