Skip to content

added requests session to ApiClient #80

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

Open
seantibor wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

added requests session to ApiClient #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e2766af
added metric component and some tests
seantibor Apr 18, 2020
c004f4a
added more tests for metric component
seantibor Apr 18, 2020
dbe3219
rollback .gitignore commit
seantibor Apr 18, 2020
5ea04a3
added metric component to client
seantibor Apr 18, 2020
24b865b
corrected client tests for new component
seantibor Apr 19, 2020
f5fc052
added requests session to ApiClient
seantibor Apr 19, 2020
513b176
Merge branch 'develop' into feature/metric
seantibor Apr 24, 2020
51ebe86
updated tests to use responses library
seantibor Apr 24, 2020
4628fda
Merge branch 'develop' into feature/requests-session
seantibor Apr 24, 2020
302ae76
added context manager to ApiClient and tests
seantibor May 8, 2020
7d35a3f
Merge branch 'develop' of https://github.com/prschmid/zoomus into fea…
seantibor May 8, 2020
87a67a0
added session getter, setter property methods
seantibor May 8, 2020
97164af
Merge branch 'feature/metric' into develop
seantibor May 11, 2020
d9f67a8
Merge branch 'develop' of https://github.com/prschmid/zoomus into dev…
seantibor May 11, 2020
3a2db45
Merge branch 'develop' into feature/requests-session
seantibor May 11, 2020
cc8bf43
Merge branch 'develop' of https://github.com/prschmid/zoomus into dev…
Apr 29, 2021
8939508
merge develop
Apr 29, 2021
6f9b62e
Merge branch 'develop' of https://github.com/prschmid/zoomus into dev…
May 5, 2021
9f78bfd
Merge branch 'develop' into feature/requests-session
May 5, 2021
c28e150
updated to black 21.4
May 5, 2021
3e19118
again and again
May 5, 2021
d0a4538
ignoring pre-commit hooks
May 5, 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
218 changes: 218 additions & 0 deletions tests/zoomus/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,20 @@ def test_url_for_ignores_trailing_slash(self):
client = util.ApiClient(base_uri="http://www.foo.com")
self.assertEqual(client.url_for("bar/"), "http://www.foo.com/bar")

@responses.activate
def test_can_multiple_request_with_session(self):
responses.add(responses.GET, "http://www.foo.com/endpoint")
responses.add(responses.POST, "http://www.foo.com/endpoint")
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.get_request("endpoint")
client.post_request("endpoint")
client.patch_request("endpoint")
client.delete_request("endpoint")

@responses.activate
def test_can_get_request(self):
responses.add(responses.GET, "http://www.foo.com/endpoint")
Expand All @@ -94,6 +108,14 @@ def test_can_get_request(self):
)
client.get_request("endpoint")

@responses.activate
def test_can_get_request_with_session(self):
responses.add(responses.GET, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.get_request("endpoint")

@responses.activate
def test_can_get_request_v2(self):
responses.add(
Expand All @@ -119,6 +141,14 @@ def test_can_get_request_with_params(self):
)
client.get_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_get_request_with_params_and_session(self):
responses.add(responses.GET, "http://www.foo.com/endpoint?foo=bar")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.get_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_get_request_with_params_v2(self):
responses.add(
Expand Down Expand Up @@ -146,6 +176,16 @@ def test_can_get_request_with_headers(self):
)
client.get_request("endpoint", headers={"foo": "bar"})

@responses.activate
def test_can_get_request_with_headers_and_session(self):
responses.add(
responses.GET, "http://www.foo.com/endpoint", headers={"foo": "bar"}
)
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.get_request("endpoint", headers={"foo": "bar"})

@responses.activate
def test_can_get_request_with_headers_v2(self):
responses.add(
Expand All @@ -167,6 +207,15 @@ def test_can_post_request(self):
)
client.post_request("endpoint")

@responses.activate
def test_can_post_request(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")

with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint")

@responses.activate
def test_can_post_request_v2(self):
responses.add(
Expand Down Expand Up @@ -195,6 +244,14 @@ def test_can_post_request_with_params(self):
)
client.post_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_post_request_with_params_and_session(self):
responses.add(responses.POST, "http://www.foo.com/endpoint?foo=bar")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_post_request_with_params_v2(self):
responses.add(
Expand All @@ -221,6 +278,15 @@ def test_can_post_request_with_dict_data(self):
client.post_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_post_request_with_dict_data_and_session(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_post_request_with_dict_data_v2(self):
responses.add(
Expand Down Expand Up @@ -251,6 +317,15 @@ def test_can_post_request_with_json_data(self):
client.post_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_post_request_with_json_data_and_session(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_post_request_with_json_data_v2(self):
responses.add(
Expand Down Expand Up @@ -285,6 +360,19 @@ def test_can_post_request_with_headers(self):
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_post_request_with_headers_and_session(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint", headers={"foo": "bar"})
expected_headers = {"foo": "bar"}
actual_headers = responses.calls[0].request.headers
self.assertTrue(
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_post_request_with_headers_v2(self):
responses.add(
Expand Down Expand Up @@ -315,6 +403,19 @@ def test_can_post_request_with_cookies(self):
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_post_request_with_cookies_and_session(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.post_request("endpoint", cookies={"foo": "bar"})
expected_headers = {"Cookie": "foo=bar"}
actual_headers = responses.calls[0].request.headers
self.assertTrue(
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_post_request_with_cookies_v2(self):
responses.add(responses.POST, "http://www.foo.com/endpoint")
Expand All @@ -337,6 +438,14 @@ def test_can_patch_request(self):
)
client.patch_request("endpoint")

@responses.activate
def test_can_patch_request_with_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint")

@responses.activate
def test_can_patch_request_v2(self):
responses.add(
Expand Down Expand Up @@ -364,6 +473,14 @@ def test_can_patch_request_with_params(self):
)
client.patch_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_patch_request_with_params_and_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint?foo=bar")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_patch_request_with_params_v2(self):
responses.add(
Expand Down Expand Up @@ -392,6 +509,15 @@ def test_can_patch_request_with_dict_data(self):
client.patch_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_patch_request_with_dict_data_and_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_patch_request_with_dict_data_v2(self):
responses.add(
Expand Down Expand Up @@ -421,6 +547,15 @@ def test_can_patch_request_with_json_data(self):
client.patch_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_patch_request_with_json_data_and_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_patch_request_with_json_data_v2(self):
responses.add(
Expand Down Expand Up @@ -454,6 +589,19 @@ def test_can_patch_request_with_headers(self):
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_patch_request_with_headers_and_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint", headers={"foo": "bar"})
expected_headers = {"foo": "bar"}
actual_headers = responses.calls[0].request.headers
self.assertTrue(
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_patch_request_with_headers_v2(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
Expand Down Expand Up @@ -481,6 +629,19 @@ def test_can_patch_request_with_cookies(self):
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_patch_request_with_cookies_and_session(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.patch_request("endpoint", cookies={"foo": "bar"})
expected_headers = {"Cookie": "foo=bar"}
actual_headers = responses.calls[0].request.headers
self.assertTrue(
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_patch_request_with_cookies_v2(self):
responses.add(responses.PATCH, "http://www.foo.com/endpoint")
Expand All @@ -503,6 +664,14 @@ def test_can_delete_request(self):
)
client.delete_request("endpoint")

@responses.activate
def test_can_delete_request_with_session(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint")

@responses.activate
def test_can_delete_request_v2(self):
responses.add(
Expand Down Expand Up @@ -531,6 +700,14 @@ def test_can_delete_request_with_params(self):

client.delete_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_delete_request_with_params_and_session(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint?foo=bar")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint", params={"foo": "bar"})

@responses.activate
def test_can_delete_request_with_params_v2(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint?foo=bar")
Expand All @@ -556,6 +733,15 @@ def test_can_delete_request_with_dict_data(self):
client.delete_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_delete_request_with_dict_data_and_session(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint", data={"foo": "bar"})
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_delete_request_with_dict_data_v2(self):
responses.add(
Expand Down Expand Up @@ -585,6 +771,15 @@ def test_can_delete_request_with_json_data(self):
client.delete_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_delete_request_with_json_data_and_session(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint", data=json.dumps({"foo": "bar"}))
self.assertEqual(responses.calls[0].request.body, '{"foo": "bar"}')

@responses.activate
def test_can_delete_request_with_json_data_v2(self):
responses.add(
Expand Down Expand Up @@ -615,6 +810,16 @@ def test_can_delete_request_with_headers(self):
)
client.delete_request("endpoint", headers={"foo": "bar"})

@responses.activate
def test_can_delete_request_with_headers_and_session(self):
responses.add(
responses.DELETE, "http://www.foo.com/endpoint", headers={"foo": "bar"}
)
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint", headers={"foo": "bar"})

@responses.activate
def test_can_delete_request_with_headers_v2(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
Expand Down Expand Up @@ -644,6 +849,19 @@ def test_can_delete_request_with_cookies(self):
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_delete_request_with_cookies_and_session(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
with util.ApiClient(
base_uri="http://www.foo.com", config={"version": util.API_VERSION_1}
) as client:
client.delete_request("endpoint", cookies={"foo": "bar"})
expected_headers = {"Cookie": "foo=bar"}
actual_headers = responses.calls[0].request.headers
self.assertTrue(
set(expected_headers.items()).issubset(set(actual_headers.items()))
)

@responses.activate
def test_can_delete_request_with_cookies_v2(self):
responses.add(responses.DELETE, "http://www.foo.com/endpoint")
Expand Down
Loading