Skip to content

Commit 23186cd

Browse files
authored
Merge pull request #250 from BeyondEvil/release-v2.0.1
Release v2.0.1
2 parents ea20a6a + 63ae99f commit 23186cd

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
directories:
1818
- $HOME/.cache/pre-commit
1919

20+
-
2021
python: 3.6
2122
env: TOXENV=py36
2223

CHANGES.rst

+14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Release Notes
22
-------------
33

4+
**2.0.1 (2019-10-05)**
5+
6+
* Properly check for presence of CSS file. (`#246 <https://github.com/pytest-dev/pytest-html/issues/246>`_)
7+
8+
* Thanks to `@wanam <https://github.com/wanam>`_ for reporting, and `@krzysztof-pawlik-gat <https://github.com/krzysztof-pawlik-gat>`_ for the fix
9+
10+
* Added support for UTF-8 display. (`#244 <https://github.com/pytest-dev/pytest-html/pull/244>`_)
11+
12+
* Thanks to `@Izhu666 <https://github.com/lzhu666>`_ for the PR
13+
14+
* Fix initial sort on column. (`#247 <https://github.com/pytest-dev/pytest-html/issues/247>`_)
15+
16+
* Thanks to `@wanam <https://github.com/wanam>`_ for reporting and fixing
17+
418
**2.0.0 (2019-09-09)**
519

620
* Drop support for Python 2.7. We will continue to accept patches to ``1.22.x`` for the time being.

testing/test_pytest_html.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -786,16 +786,16 @@ def test_css_invalid_no_html(self, testdir):
786786
testdir.makepyfile("def test_pass(): pass")
787787
result = testdir.runpytest("--css", "style.css")
788788
assert result.ret == 0
789-
789+
790790
def test_report_display_utf8(self, testdir):
791791
testdir.makepyfile(
792792
"""
793793
import pytest
794-
@pytest.mark.parametrize("caseName,input,expected", [('测试用例名称', '6*6', 36)])
795-
def test_eval(caseName, input, expected):
796-
assert eval(input) == expected
794+
@pytest.mark.parametrize("utf8", [("测试用例名称")])
795+
def test_pass(utf8):
796+
assert True
797797
"""
798798
)
799799
result, html = run(testdir)
800800
assert result.ret == 0
801-
assert r'\u6d4b\u8bd5\u7528\u4f8b\u540d\u79f0' not in html
801+
assert r"\u6d4b\u8bd5\u7528\u4f8b\u540d\u79f0" not in html

0 commit comments

Comments
 (0)