jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #567 from ueokande/blacklist-with-port

Browse source 
Support blacklist with port
This commit is contained in:
Shin'ya Ueoka 2019-04-17 12:25:02 +00:00 • committed by GitHub
commit 15b3372c66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 86 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
QA.md
View file

@ -69,14 +69,6 @@ The behaviors of the console are tested in [Console section](#consoles).
- validations in `"search"` section are not tested in this release
##### `"blacklist"` section
- [ ] `github.com/a` blocks `github.com/a`, and not blocks `github.com/aa`
- [ ] `github.com/a*` blocks both `github.com/a` and `github.com/aa`
- [ ] `github.com/` blocks `github.com/`, and not blocks `github.com/a`
- [ ] `github.com` blocks both `github.com/` and `github.com/a`
- [ ] `*.github.com` blocks `gist.github.com/`, and not `github.com`
##### Updating
- [ ] changes are updated on textarea blure when no errors

77
e2e/blacklist.test.js Normal file
View file

@ -0,0 +1,77 @@
const express = require('express');
const lanthan = require('lanthan');
const path = require('path');
const assert = require('assert');
const settings = require('./settings');
const newApp = () => {
let app = express();
app.get('/*', (req, res) => {
res.status(200).send(`<!DOCTYPEhtml>
<html lang="en">
<body style="width:10000px; height:10000px"></body>
</html>`);
});
return app;
};
describe("navigate test", () => {
const port = 12321;
let http;
let firefox;
let session;
let browser;
before(async() => {
http = newApp().listen(port);
firefox = await lanthan.firefox({
spy: path.join(__dirname, '..'),
builderf: (builder) => {
builder.addFile('build/settings.js');
},
});
session = firefox.session;
browser = firefox.browser;
});
after(async() => {
if (firefox) {
await firefox.close();
}
http.close();
});
it('should disable add-on if the URL is in the blacklist', async () => {
await browser.storage.local.set({
settings: {
source: 'json',
json: `{
"keymaps": {
"j": { "type": "scroll.vertically", "count": 1 }
},
"blacklist": [ "127.0.0.1:${port}/a" ]
}`,
},
});
await session.navigateTo(`http://127.0.0.1:${port}/a`);
let body = await session.findElementByCSS('body');
await body.sendKeys('j');
// not works
let pageYOffset = await session.executeScript(() => window.pageYOffset);
assert.equal(pageYOffset, 0);
await session.navigateTo(`http://127.0.0.1:${port}/ab`);
body = await session.findElementByCSS('body');
await body.sendKeys('j');
// works
pageYOffset = await session.executeScript(() => window.pageYOffset);
assert.equal(pageYOffset, 64);
});
});

4
src/shared/blacklists.js
View file

@ -4,9 +4,9 @@ const includes = (blacklist, url) => {
let u = new URL(url);
return blacklist.some((item) => {
if (!item.includes('/')) {
return re.fromWildcard(item).test(u.hostname);
return re.fromWildcard(item).test(u.host);
}
return re.fromWildcard(item).test(u.hostname + u.pathname);
return re.fromWildcard(item).test(u.host + u.pathname);
});
};

7
test/shared/blacklists.test.js
View file

@ -39,4 +39,11 @@ describe("shared/blacklist", () => {
expect(includes(blacklist, 'https://github.com/abcdef')).to.be.true;
expect(includes(blacklist, 'https://gist.github.com/abc')).to.be.false;
})
it('matches address and port', () => {
let blacklist = ['127.0.0.1:8888'];
expect(includes(blacklist, 'http://127.0.0.1:8888/')).to.be.true;
expect(includes(blacklist, 'http://127.0.0.1:8888/hello')).to.be.true;
})
});