From 304145f4420180b23e0836a6d11fc0cec0e341bd Mon Sep 17 00:00:00 2001 From: codl Date: Mon, 27 Nov 2017 14:35:02 +0100 Subject: rename mastodon and mastodon_anonymous fixtures to api, api_anonymous it was starting to get confusing --- tests/conftest.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index ce013cb..a0733b5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,27 +1,27 @@ import pytest @pytest.fixture -def mastodon(): - import mastodon as _mastodon - return _mastodon.Mastodon( +def api(): + import mastodon + return mastodon.Mastodon( api_base_url='http://localhost:3000', client_id='__MASTODON_PY_TEST_ID', client_secret='__MASTODON_PY_TEST_SECRET', access_token='__MASTODON_PY_TEST_TOKEN') @pytest.fixture -def mastodon_anonymous(): - import mastodon as _mastodon - return _mastodon.Mastodon( +def api_anonymous(): + import mastodon + return mastodon.Mastodon( api_base_url='http://localhost:3000', client_id='__MASTODON_PY_TEST_ID', client_secret='__MASTODON_PY_TEST_SECRET') @pytest.fixture() -def status(mastodon): - _status = mastodon.status_post('Toot!') +def status(api): + _status = api.status_post('Toot!') yield _status - mastodon.status_delete(_status['id']) + api.status_delete(_status['id']) @pytest.fixture() -- cgit v1.2.3