| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 # This file is part of Adblock Plus <https://adblockplus.org/>, | 1 # This file is part of Adblock Plus <https://adblockplus.org/>, |
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present eyeo GmbH |
| 3 # | 3 # |
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify |
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as |
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. |
| 7 # | 7 # |
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, |
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 }, | 60 }, |
| 61 '@@http://bla$~script,~other,sitekey=foo|bar': { | 61 '@@http://bla$~script,~other,sitekey=foo|bar': { |
| 62 'selector': {'type': ST.URL_PATTERN, 'value': 'http://bla'}, | 62 'selector': {'type': ST.URL_PATTERN, 'value': 'http://bla'}, |
| 63 'action': FA.ALLOW, | 63 'action': FA.ALLOW, |
| 64 'options': [ | 64 'options': [ |
| 65 (OPT.SCRIPT, False), | 65 (OPT.SCRIPT, False), |
| 66 (OPT.OTHER, False), | 66 (OPT.OTHER, False), |
| 67 (OPT.SITEKEY, ['foo', 'bar']), | 67 (OPT.SITEKEY, ['foo', 'bar']), |
| 68 ], | 68 ], |
| 69 }, | 69 }, |
| 70 "||foo.com^$csp=script-src 'self' * 'unsafe-inline'": { | |
| 71 'selector': {'type': ST.URL_PATTERN, 'value': '||foo.com^'}, | |
| 72 'action': FA.BLOCK, | |
| 73 'options': [ | |
| 74 (OPT.CSP, "script-src 'self' * 'unsafe-inline'"), | |
| 75 ], | |
| 76 }, | |
| 77 'bla$match-case,csp=first csp,script,other,domain=foo.com,sitekey=foo': { | |
|
Vasily Kuznetsov
2018/06/08 16:41:48
It seems like this test does more or less the sane
rhowell
2018/06/12 21:13:18
Done.
| |
| 78 'selector': {'type': ST.URL_PATTERN, 'value': 'bla'}, | |
| 79 'action': FA.BLOCK, | |
| 80 'options': [ | |
| 81 ('match-case', True), | |
| 82 ('csp', 'first csp'), | |
| 83 ('script', True), | |
| 84 ('other', True), | |
| 85 ('domain', [('foo.com', True)]), | |
| 86 ('sitekey', ['foo']), | |
| 87 ], | |
| 88 }, | |
| 89 'bla$~match-case,~csp=csp,~script,~other,~third-party,domain=~bar.com': { | |
| 90 'selector': {'type': ST.URL_PATTERN, 'value': 'bla'}, | |
| 91 'action': FA.BLOCK, | |
| 92 'options': [ | |
| 93 ('match-case', False), | |
| 94 ('csp=csp', False), | |
|
Vasily Kuznetsov
2018/06/08 16:41:48
Hm, I think this should be ('csp', False). I guess
rhowell
2018/06/12 21:13:18
Done.
| |
| 95 ('script', False), | |
| 96 ('other', False), | |
| 97 ('third-party', False), | |
| 98 ('domain', [('bar.com', False)]), | |
| 99 ], | |
| 100 }, | |
| 101 '@@bla$script,other,domain=foo.com|~bar.foo.com,csp=c s p': { | |
|
Vasily Kuznetsov
2018/06/08 16:41:48
This one adds testing, of a CSP option in an excep
rhowell
2018/06/12 21:13:18
I already combined the first two csp tests, so now
| |
| 102 'selector': {'type': ST.URL_PATTERN, 'value': 'bla'}, | |
| 103 'action': FA.ALLOW, | |
| 104 'options': [ | |
| 105 ('script', True), | |
| 106 ('other', True), | |
| 107 ('domain', [('foo.com', True), ('bar.foo.com', False)]), | |
| 108 ('csp', 'c s p'), | |
| 109 ], | |
| 110 }, | |
| 70 # Element hiding filters and exceptions. | 111 # Element hiding filters and exceptions. |
| 71 '##ddd': { | 112 '##ddd': { |
| 72 'selector': {'type': ST.CSS, 'value': 'ddd'}, | 113 'selector': {'type': ST.CSS, 'value': 'ddd'}, |
| 73 'action': FA.HIDE, | 114 'action': FA.HIDE, |
| 74 'options': [], | 115 'options': [], |
| 75 }, | 116 }, |
| 76 '#@#body > div:first-child': { | 117 '#@#body > div:first-child': { |
| 77 'selector': {'type': ST.CSS, 'value': 'body > div:first-child'}, | 118 'selector': {'type': ST.CSS, 'value': 'body > div:first-child'}, |
| 78 'action': FA.SHOW, | 119 'action': FA.SHOW, |
| 79 'options': [], | 120 'options': [], |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 def test_exception_timing(): | 199 def test_exception_timing(): |
| 159 result = parse_filterlist(['! good line', '%bad line%']) | 200 result = parse_filterlist(['! good line', '%bad line%']) |
| 160 assert next(result) == Comment('good line') | 201 assert next(result) == Comment('good line') |
| 161 with pytest.raises(ParseError): | 202 with pytest.raises(ParseError): |
| 162 next(result) | 203 next(result) |
| 163 | 204 |
| 164 | 205 |
| 165 def test_parse_line_bytes(): | 206 def test_parse_line_bytes(): |
| 166 line = parse_line(b'! \xc3\xbc') | 207 line = parse_line(b'! \xc3\xbc') |
| 167 assert line.text == '\xfc' | 208 assert line.text == '\xfc' |
| OLD | NEW |