Skip to content

Commit

Permalink
Make discover() method more flexible
Browse files Browse the repository at this point in the history
  • Loading branch information
fguillot committed Oct 27, 2018
1 parent 97eee11 commit 6b6589e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions miniflux.py
Expand Up @@ -82,9 +82,11 @@ def import_feeds(self, opml):
return response.json()
raise ClientError(response)

def discover(self, website_url, username='', password=''):
def discover(self, website_url, **kwargs):
endpoint = self._get_endpoint('/discover')
data = {'url': website_url, 'username': username, 'password': password}
data = dict(url=website_url)
data.update(kwargs)

response = requests.post(endpoint, auth=self._auth, data=json.dumps(data), timeout=self._timeout)
if response.status_code == 200:
return response.json()
Expand Down
7 changes: 4 additions & 3 deletions tests/test_client.py
Expand Up @@ -136,8 +136,8 @@ def test_discover():
payload = json.loads(kwargs.get('data'))

assert payload.get('url') == "http://example.org/"
assert payload.get('username') == ""
assert payload.get('password') == ""
assert payload.get('username') is None
assert payload.get('password') is None
assert result == expected_result


Expand All @@ -152,7 +152,7 @@ def test_discover_with_credentials():
requests.post.return_value = response

client = miniflux.Client("http://localhost", "username", "password")
result = client.discover("http://example.org/", "foobar", "secret")
result = client.discover("http://example.org/", username="foobar", password="secret", user_agent="Bot")

requests.post.assert_called_once_with('http://localhost/v1/discover',
auth=('username', 'password'),
Expand All @@ -165,6 +165,7 @@ def test_discover_with_credentials():
assert payload.get('url') == "http://example.org/"
assert payload.get('username') == "foobar"
assert payload.get('password') == "secret"
assert payload.get('user_agent') == "Bot"
assert result == expected_result


Expand Down

0 comments on commit 6b6589e

Please sign in to comment.