Skip to content

Commit df27a32

Browse files
tharropoulostharropoulos
committed
chore(tests): remove redudant mocked tests
1 parent aae9d75 commit df27a32

29 files changed

Lines changed: 1 addition & 1564 deletions

‎pyproject.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ dev = [
4141
"pytest",
4242
"coverage",
4343
"pytest-mock",
44-
"requests-mock",
4544
"python-dotenv",
4645
"types-requests",
4746
"faker",

‎tests/alias_test.py‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
"""Tests for the Alias class."""
22

33
from __future__ import annotations
4-
5-
import requests_mock
6-
74
from tests.utils.object_assertions import (
85
assert_match_object,
96
assert_object_lists_match,
@@ -12,7 +9,6 @@
129
from typesense.alias import Alias
1310
from typesense.aliases import Aliases
1411
from typesense.api_call import ApiCall
15-
from typesense.types.alias import AliasSchema
1612

1713

1814
def test_init(fake_api_call: ApiCall) -> None:
@@ -32,51 +28,6 @@ def test_init(fake_api_call: ApiCall) -> None:
3228
assert alias._endpoint_path == "/aliases/company_alias" # noqa: WPS437
3329

3430

35-
def test_retrieve(fake_alias: Alias) -> None:
36-
"""Test that the Alias object can retrieve an alias."""
37-
json_response: AliasSchema = {
38-
"collection_name": "companies",
39-
"name": "company_alias",
40-
}
41-
42-
with requests_mock.Mocker() as mock:
43-
mock.get(
44-
"/aliases/company_alias",
45-
json=json_response,
46-
)
47-
48-
response = fake_alias.retrieve()
49-
50-
assert len(mock.request_history) == 1
51-
assert mock.request_history[0].method == "GET"
52-
assert (
53-
mock.request_history[0].url == "http://nearest:8108/aliases/company_alias"
54-
)
55-
assert response == json_response
56-
57-
58-
def test_delete(fake_alias: Alias) -> None:
59-
"""Test that the Alias object can delete an alias."""
60-
json_response: AliasSchema = {
61-
"collection_name": "companies",
62-
"name": "company_alias",
63-
}
64-
with requests_mock.Mocker() as mock:
65-
mock.delete(
66-
"/aliases/company_alias",
67-
json=json_response,
68-
)
69-
70-
response = fake_alias.delete()
71-
72-
assert len(mock.request_history) == 1
73-
assert mock.request_history[0].method == "DELETE"
74-
assert (
75-
mock.request_history[0].url == "http://nearest:8108/aliases/company_alias"
76-
)
77-
assert response == json_response
78-
79-
8031
def test_actual_retrieve(
8132
actual_aliases: Aliases,
8233
delete_all_aliases: None,

‎tests/aliases_test.py‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
"""Tests for the Aliases class."""
22

33
from __future__ import annotations
4-
5-
import requests_mock
6-
74
from tests.utils.object_assertions import (
85
assert_match_object,
96
assert_object_lists_match,
107
assert_to_contain_object,
118
)
129
from typesense.aliases import Aliases
1310
from typesense.api_call import ApiCall
14-
from typesense.types.alias import AliasesResponseSchema, AliasSchema
1511

1612

1713
def test_init(fake_api_call: ApiCall) -> None:
@@ -57,58 +53,6 @@ def test_get_existing_alias(fake_aliases: Aliases) -> None:
5753
assert alias is fetched_alias
5854

5955

60-
def test_retrieve(fake_aliases: Aliases) -> None:
61-
"""Test that the Aliases object can retrieve aliases."""
62-
json_response: AliasesResponseSchema = {
63-
"aliases": [
64-
{
65-
"collection_name": "companies",
66-
"name": "company_alias",
67-
},
68-
],
69-
}
70-
71-
with requests_mock.Mocker() as mock:
72-
mock.get(
73-
"http://nearest:8108/aliases",
74-
json=json_response,
75-
)
76-
77-
response = fake_aliases.retrieve()
78-
79-
assert len(response) == 1
80-
assert response["aliases"][0] == {
81-
"collection_name": "companies",
82-
"name": "company_alias",
83-
}
84-
assert response == json_response
85-
86-
87-
def test_create(fake_aliases: Aliases) -> None:
88-
"""Test that the Aliases object can create a alias."""
89-
json_response: AliasSchema = {
90-
"collection_name": "companies",
91-
"name": "company_alias",
92-
}
93-
94-
with requests_mock.Mocker() as mock:
95-
mock.put(
96-
"http://nearest:8108/aliases/company_alias",
97-
json=json_response,
98-
)
99-
100-
fake_aliases.upsert(
101-
"company_alias",
102-
{"collection_name": "companies", "name": "company_alias"},
103-
)
104-
105-
assert mock.call_count == 1
106-
assert mock.called is True
107-
assert mock.last_request.method == "PUT"
108-
assert mock.last_request.url == "http://nearest:8108/aliases/company_alias"
109-
assert mock.last_request.json() == json_response
110-
111-
11256
def test_actual_create(actual_aliases: Aliases, delete_all_aliases: None) -> None:
11357
"""Test that the Aliases object can create an alias on Typesense Server."""
11458
response = actual_aliases.upsert("company_alias", {"collection_name": "companies"})

‎tests/analytics_events_test.py‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from __future__ import annotations
44

55
import pytest
6-
import requests_mock
76

87
from tests.utils.version import is_v30_or_above
98
from typesense.client import Client
@@ -50,18 +49,6 @@ def test_actual_create_event(
5049
actual_client.analytics.rules["company_analytics_rule"].delete()
5150

5251

53-
def test_create_event(fake_client: Client) -> None:
54-
event: AnalyticsEvent = {
55-
"name": "company_analytics_rule",
56-
"event_type": "query",
57-
"data": {"user_id": "user-1", "q": "apple"},
58-
}
59-
with requests_mock.Mocker() as mock:
60-
mock.post("http://nearest:8108/analytics/events", json={"ok": True})
61-
resp = fake_client.analytics.events.create(event)
62-
assert resp["ok"] is True
63-
64-
6552
def test_status(actual_client: Client, delete_all: None) -> None:
6653
status = actual_client.analytics.events.status()
6754
assert isinstance(status, dict)
@@ -140,10 +127,3 @@ def test_acutal_retrieve_events(
140127
def test_acutal_flush(actual_client: Client, delete_all: None) -> None:
141128
resp = actual_client.analytics.events.flush()
142129
assert resp["ok"] in [True, False]
143-
144-
145-
def test_flush(fake_client: Client) -> None:
146-
with requests_mock.Mocker() as mock:
147-
mock.post("http://nearest:8108/analytics/flush", json={"ok": True})
148-
resp = fake_client.analytics.events.flush()
149-
assert resp["ok"] is True

‎tests/analytics_rule_test.py‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from __future__ import annotations
44

55
import pytest
6-
import requests_mock
76

87
from tests.utils.version import is_v30_or_above
98
from typesense.client import Client
@@ -24,30 +23,6 @@
2423
)
2524

2625

27-
def test_rule_retrieve(fake_api_call) -> None:
28-
rule = AnalyticsRule(fake_api_call, "company_analytics_rule")
29-
expected = {"name": "company_analytics_rule"}
30-
with requests_mock.Mocker() as mock:
31-
mock.get(
32-
"http://nearest:8108/analytics/rules/company_analytics_rule",
33-
json=expected,
34-
)
35-
resp = rule.retrieve()
36-
assert resp == expected
37-
38-
39-
def test_rule_delete(fake_api_call) -> None:
40-
rule = AnalyticsRule(fake_api_call, "company_analytics_rule")
41-
expected = {"name": "company_analytics_rule"}
42-
with requests_mock.Mocker() as mock:
43-
mock.delete(
44-
"http://nearest:8108/analytics/rules/company_analytics_rule",
45-
json=expected,
46-
)
47-
resp = rule.delete()
48-
assert resp == expected
49-
50-
5126
def test_actual_rule_retrieve(
5227
actual_analytics_rules: AnalyticsRules,
5328
delete_all: None,

‎tests/analytics_rule_v1_test.py‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from __future__ import annotations
44

55
import pytest
6-
import requests_mock
76

87
from tests.utils.object_assertions import assert_match_object, assert_object_lists_match
98
from tests.utils.version import is_v30_or_above
@@ -46,66 +45,24 @@ def test_init(fake_api_call: ApiCall) -> None:
4645
)
4746

4847

49-
def test_retrieve(fake_analytics_rule: AnalyticsRuleV1) -> None:
50-
"""Test that the AnalyticsRuleV1 object can retrieve an analytics_rule."""
51-
json_response: RuleSchemaForQueries = {
5248
"name": "company_analytics_rule",
5349
"params": {
54-
"destination": {
55-
"collection": "companies_queries",
56-
},
5750
"source": {"collections": ["companies"]},
5851
},
5952
"type": "nohits_queries",
6053
}
6154

62-
with requests_mock.Mocker() as mock:
63-
mock.get(
64-
"/analytics/rules/company_analytics_rule",
65-
json=json_response,
66-
)
67-
68-
response = fake_analytics_rule.retrieve()
6955

70-
assert len(mock.request_history) == 1
71-
assert mock.request_history[0].method == "GET"
72-
assert (
73-
mock.request_history[0].url
74-
== "http://nearest:8108/analytics/rules/company_analytics_rule"
75-
)
76-
assert response == json_response
7756

7857

79-
def test_delete(fake_analytics_rule: AnalyticsRuleV1) -> None:
80-
"""Test that the AnalyticsRuleV1 object can delete an analytics_rule."""
81-
json_response: RuleDeleteSchema = {
8258
"name": "company_analytics_rule",
8359
}
84-
with requests_mock.Mocker() as mock:
85-
mock.delete(
86-
"/analytics/rules/company_analytics_rule",
87-
json=json_response,
88-
)
89-
90-
response = fake_analytics_rule.delete()
91-
92-
assert len(mock.request_history) == 1
93-
assert mock.request_history[0].method == "DELETE"
94-
assert (
95-
mock.request_history[0].url
96-
== "http://nearest:8108/analytics/rules/company_analytics_rule"
97-
)
98-
assert response == json_response
9960

10061

101-
def test_actual_retrieve(
102-
actual_analytics_rules: AnalyticsRulesV1,
10362
delete_all: None,
10463
delete_all_analytics_rules_v1: None,
10564
create_analytics_rule_v1: None,
10665
) -> None:
107-
"""Test that the AnalyticsRuleV1 object can retrieve a rule from Typesense Server."""
108-
response = actual_analytics_rules["company_analytics_rule"].retrieve()
10966

11067
expected: RuleSchemaForQueries = {
11168
"name": "company_analytics_rule",
@@ -120,14 +77,10 @@ def test_actual_retrieve(
12077
assert response == expected
12178

12279

123-
def test_actual_delete(
124-
actual_analytics_rules: AnalyticsRulesV1,
12580
delete_all: None,
12681
delete_all_analytics_rules_v1: None,
12782
create_analytics_rule_v1: None,
12883
) -> None:
129-
"""Test that the AnalyticsRuleV1 object can delete a rule from Typesense Server."""
130-
response = actual_analytics_rules["company_analytics_rule"].delete()
13184

13285
expected: RuleDeleteSchema = {
13386
"name": "company_analytics_rule",

‎tests/analytics_rules_test.py‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from __future__ import annotations
44

55
import pytest
6-
import requests_mock
76

87
from tests.utils.version import is_v30_or_above
98
from typesense.client import Client
@@ -37,56 +36,6 @@ def test_rule_getitem(fake_api_call) -> None:
3736
assert rule._endpoint_path == "/analytics/rules/company_analytics_rule"
3837

3938

40-
def test_rules_create(fake_api_call) -> None:
41-
rules = AnalyticsRules(fake_api_call)
42-
body: AnalyticsRuleCreate = {
43-
"name": "company_analytics_rule",
44-
"type": "popular_queries",
45-
"collection": "companies",
46-
"event_type": "search",
47-
"params": {"destination_collection": "companies_queries", "limit": 1000},
48-
}
49-
with requests_mock.Mocker() as mock:
50-
mock.post("http://nearest:8108/analytics/rules", json=body)
51-
resp = rules.create(body)
52-
assert resp == body
53-
54-
55-
def test_rules_retrieve_with_tag(fake_api_call) -> None:
56-
rules = AnalyticsRules(fake_api_call)
57-
with requests_mock.Mocker() as mock:
58-
mock.get(
59-
"http://nearest:8108/analytics/rules?rule_tag=homepage",
60-
json=[{"name": "rule1", "rule_tag": "homepage"}],
61-
)
62-
resp = rules.retrieve(rule_tag="homepage")
63-
assert isinstance(resp, list)
64-
assert resp[0]["rule_tag"] == "homepage"
65-
66-
67-
def test_rules_upsert(fake_api_call) -> None:
68-
rules = AnalyticsRules(fake_api_call)
69-
with requests_mock.Mocker() as mock:
70-
mock.put(
71-
"http://nearest:8108/analytics/rules/company_analytics_rule",
72-
json={"name": "company_analytics_rule"},
73-
)
74-
resp = rules.upsert("company_analytics_rule", {"params": {}})
75-
assert resp["name"] == "company_analytics_rule"
76-
77-
78-
def test_rules_retrieve(fake_api_call) -> None:
79-
rules = AnalyticsRules(fake_api_call)
80-
with requests_mock.Mocker() as mock:
81-
mock.get(
82-
"http://nearest:8108/analytics/rules",
83-
json=[{"name": "company_analytics_rule"}],
84-
)
85-
resp = rules.retrieve()
86-
assert isinstance(resp, list)
87-
assert resp[0]["name"] == "company_analytics_rule"
88-
89-
9039
def test_actual_create(
9140
actual_analytics_rules: AnalyticsRules,
9241
delete_all: None,

0 commit comments

Comments
 (0)