Skip to content

Commit

Permalink
Fixes tests due to invalid URI.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakubpawlowicz
jakubpawlowicz committed Nov 30, 2023
1 parent dee95d7 commit 0c31301
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
66 changes: 33 additions & 33 deletions test/protocol-imports-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ vows.describe('protocol imports').addBatch({
topic: function () {
this.reqMocks1 = nock('http://127.0.0.1')
.get('/present.css')
.reply(200, '@import url(/vendor/reset.css);@import url(https://assets.127.0.0.1/base.css);p{font-size:13px}')
.reply(200, '@import url(/vendor/reset.css);@import url(https://127.0.0.2/base.css);p{font-size:13px}')
.get('/vendor/reset.css')
.reply(200, 'body{margin:0}');
this.reqMocks2 = nock('https://assets.127.0.0.1')
this.reqMocks2 = nock('https://127.0.0.2')
.get('/base.css')
.reply(200, 'div{padding:0}');

Expand Down Expand Up @@ -670,7 +670,7 @@ vows.describe('protocol imports').addBatch({

this.proxied = false;

this.reqMocks = nock('http://assets.127.0.0.1')
this.reqMocks = nock('http://127.0.0.2')
.get('/styles.css')
.reply(200, 'a{color:red}');

Expand All @@ -688,7 +688,7 @@ vows.describe('protocol imports').addBatch({
}
};

new CleanCSS(options).minify('@import url(http://assets.127.0.0.1/styles.css);', self.callback);
new CleanCSS(options).minify('@import url(http://127.0.0.2/styles.css);', self.callback);
});
enableDestroy(this.proxyServer);
},
Expand All @@ -714,7 +714,7 @@ vows.describe('protocol imports').addBatch({

this.proxied = false;

this.reqMocks = nock('http://assets.127.0.0.1')
this.reqMocks = nock('http://127.0.0.2')
.get('/sslstyles.css')
.reply(200, 'a{color:red}');

Expand All @@ -733,7 +733,7 @@ vows.describe('protocol imports').addBatch({
}
};

new CleanCSS(options).minify('@import url(https://assets.127.0.0.1/sslstyles.css);', self.callback);
new CleanCSS(options).minify('@import url(https://127.0.0.2/sslstyles.css);', self.callback);
});
enableDestroy(this.proxyServer);
},
Expand All @@ -760,7 +760,7 @@ vows.describe('protocol imports').addBatch({
var self = this;
nock.enableNetConnect();

this.reqMocks = nock('http://assets.127.0.0.1')
this.reqMocks = nock('http://127.0.0.2')
.get('/styles.css')
.reply(200, 'a{color:red}');

Expand All @@ -772,7 +772,7 @@ vows.describe('protocol imports').addBatch({
});
this.proxyServer.listen(8081, function () {
process.env.http_proxy = 'http://127.0.0.1:8081';
new CleanCSS({ inline: 'all' }).minify('@import url(http://assets.127.0.0.1/styles.css);', self.callback);
new CleanCSS({ inline: 'all' }).minify('@import url(http://127.0.0.2/styles.css);', self.callback);
});
enableDestroy(this.proxyServer);
},
Expand All @@ -797,7 +797,7 @@ vows.describe('protocol imports').addBatch({
var self = this;
nock.enableNetConnect();

this.reqMocks = nock('http://assets.127.0.0.1')
this.reqMocks = nock('http://127.0.0.2')
.get('/styles.css')
.reply(200, 'a{color:red}');

Expand All @@ -817,7 +817,7 @@ vows.describe('protocol imports').addBatch({
};

process.env.http_proxy = 'http://some-fake-proxy:8082';
new CleanCSS(options).minify('@import url(http://assets.127.0.0.1/styles.css);', self.callback);
new CleanCSS(options).minify('@import url(http://127.0.0.2/styles.css);', self.callback);
});
enableDestroy(this.proxyServer);
},
Expand All @@ -839,7 +839,7 @@ vows.describe('protocol imports').addBatch({
}).addBatch({
'allowed imports - not set': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
new CleanCSS().minify(source, this.callback);
},
'should not raise errors': function (error, minified) {
Expand All @@ -848,15 +848,15 @@ vows.describe('protocol imports').addBatch({
'should raise warnings': function (error, minified) {
assert.lengthOf(minified.warnings, 2);
assert.equal(minified.warnings[0], 'Skipping remote @import of "http://127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://assets.127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://127.0.0.2/remote.css" as resource is not allowed.');
},
'should process imports': function (error, minified) {
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);.one{color:red}');
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);.one{color:red}');
}
},
'allowed imports - not set and disabled by `inline`': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
new CleanCSS({ inline: ['none'] }).minify(source, this.callback);
},
'should not raise errors': function (error, minified) {
Expand All @@ -866,12 +866,12 @@ vows.describe('protocol imports').addBatch({
assert.isEmpty(minified.warnings);
},
'should process imports': function (error, minified) {
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);');
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);');
}
},
'allowed imports - local': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
new CleanCSS({ inline: ['local'] }).minify(source, this.callback);
},
'should not raise errors': function (error, minified) {
Expand All @@ -880,19 +880,19 @@ vows.describe('protocol imports').addBatch({
'should raise warnings': function (error, minified) {
assert.lengthOf(minified.warnings, 2);
assert.equal(minified.warnings[0], 'Skipping remote @import of "http://127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://assets.127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://127.0.0.2/remote.css" as resource is not allowed.');
},
'should keeps imports': function (error, minified) {
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);.one{color:red}');
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);.one{color:red}');
}
},
'allowed imports - remote': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks1 = nock('http://127.0.0.1')
.get('/remote.css')
.reply(200, 'div{border:0}');
this.reqMocks2 = nock('http://assets.127.0.0.1')
this.reqMocks2 = nock('http://127.0.0.2')
.get('/remote.css')
.reply(200, 'p{width:100%}');
new CleanCSS({ inline: ['remote'] }).minify(source, this.callback);
Expand All @@ -916,11 +916,11 @@ vows.describe('protocol imports').addBatch({
},
'allowed imports - remote when local resource is missing': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(missing.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(missing.css);';
this.reqMocks1 = nock('http://127.0.0.1')
.get('/remote.css')
.reply(200, 'div{border:0}');
this.reqMocks2 = nock('http://assets.127.0.0.1')
this.reqMocks2 = nock('http://127.0.0.2')
.get('/remote.css')
.reply(200, 'p{width:100%}');
new CleanCSS({ inline: ['remote'] }).minify(source, this.callback);
Expand All @@ -944,11 +944,11 @@ vows.describe('protocol imports').addBatch({
},
'allowed imports - all': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks1 = nock('http://127.0.0.1')
.get('/remote.css')
.reply(200, 'div{border:0}');
this.reqMocks2 = nock('http://assets.127.0.0.1')
this.reqMocks2 = nock('http://127.0.0.2')
.get('/remote.css')
.reply(200, 'p{width:100%}');
new CleanCSS({ inline: ['all'] }).minify(source, this.callback);
Expand All @@ -972,20 +972,20 @@ vows.describe('protocol imports').addBatch({
},
'allowed imports - blacklisted': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
new CleanCSS({ inline: ['remote', 'local', '!assets.127.0.0.1', '!127.0.0.1', '!test/fixtures/partials/one.css'] }).minify(source, this.callback);
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
new CleanCSS({ inline: ['remote', 'local', '!127.0.0.2', '!127.0.0.1', '!test/fixtures/partials/one.css'] }).minify(source, this.callback);
},
'should not raise errors': function (error, minified) {
assert.isEmpty(minified.errors);
},
'should raise a warning': function (error, minified) {
assert.lengthOf(minified.warnings, 3);
assert.equal(minified.warnings[0], 'Skipping remote @import of "http://127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://assets.127.0.0.1/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[1], 'Skipping remote @import of "http://127.0.0.2/remote.css" as resource is not allowed.');
assert.equal(minified.warnings[2], 'Skipping local @import of "test/fixtures/partials/one.css" as resource is not allowed.');
},
'should process first imports': function (error, minified) {
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);');
assert.equal(minified.styles, '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);');
}
},
'allowed imports - no-protocol': {
Expand All @@ -1007,11 +1007,11 @@ vows.describe('protocol imports').addBatch({
}).addBatch({
'allowed imports - from specific URI': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks = nock('http://assets.127.0.0.1')
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks = nock('http://127.0.0.2')
.get('/remote.css')
.reply(200, 'p{width:100%}');
new CleanCSS({ inline: ['http://assets.127.0.0.1/remote.css', 'test/fixtures/partials/one.css'] }).minify(source, this.callback);
new CleanCSS({ inline: ['http://127.0.0.2/remote.css', 'test/fixtures/partials/one.css'] }).minify(source, this.callback);
},
'should not raise errors': function (error, minified) {
assert.isEmpty(minified.errors);
Expand All @@ -1031,8 +1031,8 @@ vows.describe('protocol imports').addBatch({
},
'allowed imports - from URI prefix': {
topic: function () {
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://assets.127.0.0.1/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks = nock('http://assets.127.0.0.1')
var source = '@import url(http://127.0.0.1/remote.css);@import url(http://127.0.0.2/remote.css);@import url(test/fixtures/partials/one.css);';
this.reqMocks = nock('http://127.0.0.2')
.get('/remote.css')
.reply(200, 'p{width:100%}');
new CleanCSS({ inline: ['remote', '!http://127.0.0.1/', 'test/fixtures/partials'] }).minify(source, this.callback);
Expand Down
4 changes: 2 additions & 2 deletions test/reader/is-allowed-resource-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ vows.describe(isAllowedResource)
'negated rules': {
'topic': 'http://127.0.0.1/path/to/styles.css',
'is not allowed': function (topic) {
assert.isFalse(isAllowedResource(topic, true, ['!127.0.0.1', '!assets.127.0.0.1']));
assert.isFalse(isAllowedResource(topic, true, ['!127.0.0.1', '!127.0.0.2']));
}
},
'negated remote then local rules': {
'topic': 'http://127.0.0.1/path/to/styles.css',
'is not allowed': function (topic) {
assert.isFalse(isAllowedResource(topic, true, ['!127.0.0.1', '!assets.127.0.0.1', '!path/to/styles.css']));
assert.isFalse(isAllowedResource(topic, true, ['!127.0.0.1', '!127.0.0.2', '!path/to/styles.css']));
}
}
})
Expand Down

0 comments on commit 0c31301

Please sign in to comment.