Issue 6920 - Only parse metadata from the top of the file

tests/test_parser.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
 
 import pytest
 
 from abp.filters import (
     parse_line, parse_filterlist, ParseError,
     SELECTOR_TYPE as ST, FILTER_ACTION as FA, FILTER_OPTION as OPT,
 )
-from abp.filters.parser import Comment, Metadata
+from abp.filters.parser import Comment, Metadata, Header
 
 
 def test_parse_empty():
     line = parse_line('    ')
     assert line.type == 'emptyline'
 
 
 @pytest.mark.parametrize('filter_text, expected', {
     # Blocking filters with patterns and regexps and blocking exceptions.
     '*asdf*d**dd*': {
@@ skipping 105 matching lines @@
     for attribute, expected_value in expected.items():
         assert getattr(parsed, attribute) == expected_value
 
 
 def test_parse_comment():
     line = parse_line('! Block foo')
     assert line.type == 'comment'
     assert line.text == 'Block foo'
 
 
-def test_parse_meta():
-    line = parse_line('! Homepage  :  http://aaa.com/b')
-    assert line.type == 'metadata'
-    assert line.key == 'Homepage'
-    assert line.value == 'http://aaa.com/b'
-
-
 def test_parse_instruction():
     line = parse_line('%include foo:bar/baz.txt%')
     assert line.type == 'include'
     assert line.target == 'foo:bar/baz.txt'
 
 
 def test_parse_bad_instruction():
     with pytest.raises(ParseError):
         parse_line('%foo bar%')
 
 
-def test_parse_header():
-    line = parse_line('[Adblock Plus 1.1]')
-    assert line.type == 'header'
-    assert line.version == 'Adblock Plus 1.1'
-
-
 def test_parse_bad_header():
     with pytest.raises(ParseError):
         parse_line('[Adblock 1.1]')
 
 
 def test_parse_filterlist():
-    result = parse_filterlist(['! foo', '! Title: bar'])
-    assert list(result) == [Comment('foo'), Metadata('Title', 'bar')]
+    result = parse_filterlist(['[Adblock Plus 1.1]',
+                               '! Homepage  :  http://aaa.com/b',
+                               '||example.com^',
+                               '! Checksum: OaopkIiiAl77sSHk/VAWDA',
+                               '! Note: bla bla'])
+
+    assert next(result) == Header('Adblock Plus 1.1')
+    assert next(result) == Metadata('Homepage', 'http://aaa.com/b')
+    assert next(result).type == 'filter'
+    assert next(result) == Metadata('Checksum', 'OaopkIiiAl77sSHk/VAWDA')
+    assert next(result).type == 'comment'
+
+    with pytest.raises(StopIteration):
+        next(result)
 
 
 def test_exception_timing():
     result = parse_filterlist(['! good line', '%bad line%'])
     assert next(result) == Comment('good line')
     with pytest.raises(ParseError):
         next(result)
 
 
 def test_parse_line_bytes():
     line = parse_line(b'! \xc3\xbc')
     assert line.text == '\xfc'