Skip to content

Fix stored source data type #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2021
Merged

Fix stored source data type #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b2ae3c
Remove testing for Django 1.11, 2.0, and 2.1
daneah Feb 14, 2021
0058627
Switch from response.content to response.text
daneah Feb 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ classifiers =
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
Framework :: Django
Framework :: Django :: 1.11
Framework :: Django :: 2.0
Framework :: Django :: 2.1
Framework :: Django :: 2.2
Framework :: Django :: 3.0
Framework :: Django :: 3.1
Expand All @@ -32,7 +29,7 @@ classifiers =
package_dir = =src
packages = find:
install_requires =
Django>=1.8.2
Django>=2.2.0
requests>=2.7.0

[options.packages.find]
Expand Down Expand Up @@ -72,15 +69,13 @@ python_files =
addopts = -ra -q --cov=webmention

[tox:tox]
envlist = {py36,py37,py38}-django{1.11,2.1,2.2,3.0,3.1}
envlist = {py36,py37,py38}-django{2.2,3.0,3.1}

[testenv]
extras = test
commands =
pytest {posargs}
deps =
django1.11: Django>=1.11,<2
django2.1: Django>=2.1,<2.2
django2.2: Django>=2.2,<2.3
django3.0: Django>=3.0,<3.1
django3.1: Django>=3.1,<3.2
Expand Down
4 changes: 2 additions & 2 deletions src/webmention/resolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def url_resolves(url):
def fetch_and_validate_source(source, target):
response = requests.get(source)
if response.status_code == 200:
if target in str(response.content):
return response.content
if target in response.text:
return response.text
else:
raise TargetNotFoundError("Source URL did not contain target URL")
else:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_resolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def test_url_resolves_when_does_not_resolve(mock_resolve):
def test_fetch_and_validate_source_happy_path(mock_get, test_source, test_target):
mock_response = Mock()
mock_response.status_code = 200
mock_response.content = '<a href="{href}">{href}</a>'.format(href=test_target)
mock_response.text = '<a href="{href}">{href}</a>'.format(href=test_target)
mock_get.return_value = mock_response

assert fetch_and_validate_source(test_source, test_target) == mock_response.content
assert fetch_and_validate_source(test_source, test_target) == mock_response.text


@patch("requests.get")
Expand All @@ -46,7 +46,7 @@ def test_fetch_and_validate_source_when_source_unavailable(mock_get, test_source
def test_fetch_and_validate_source_when_source_does_not_contain_target(mock_get, test_source, test_target):
mock_response = Mock()
mock_response.status_code = 200
mock_response.content = "foo"
mock_response.text = "foo"
mock_get.return_value = mock_response

with pytest.raises(TargetNotFoundError):
Expand Down