Updated generic resource and tests

Author: albertsola

tests/http/models/test_genric_resource.py

@@ -11,6 +11,7 @@ def meta_data():
 
 def test_generic_resource_empty():
     resource = GenericResource()
+
     assert resource.meta is None
     assert resource.to_dict() == {}
 
@@ -26,23 +27,13 @@ def test_from_response(meta_data):
     assert resource.meta == expected_meta
 
 
-def test_attribute_access():
+def test_attribute_getter(mocker, meta_data):
     resource_data = {"id": 1, "name": {"given": "Albert", "family": "Einstein"}}
-    meta = Meta.from_response(Response(200, json={"$meta": {}}))
-    resource = GenericResource(resource_data=resource_data, meta=meta)
-
-    assert resource.meta == meta
+    response = Response(200, json={"data": resource_data, "$meta": meta_data})
+    resource = GenericResource.from_response(response)
 
     assert resource.id == 1
-
-    with pytest.raises(AttributeError, match=r"'Box' object has no attribute 'address'"):
-        resource.address  # noqa: B018
-
-    with pytest.raises(AttributeError, match=r"'Box' object has no attribute 'surname'"):
-        resource.name.surname  # noqa: B018
-
     assert resource.name.given == "Albert"
-    assert resource.name.to_dict() == resource_data["name"]
 
 
 def test_attribute_setter():

tests/http/models/test_pagination.py

@@ -37,18 +37,14 @@ def test_has_next(mocker, num_page, total_pages, expected_has_next):
     mocker.patch.object(pagination, "num_page", return_value=num_page)
     mocker.patch.object(pagination, "total_pages", return_value=total_pages)
 
-    assert pagination.has_next() == expected_has_next
+    has_next = pagination.has_next()
+
+    assert has_next == expected_has_next
 
 
 @pytest.mark.parametrize(
     ("limit", "offset", "expected_page"),
-    [
-        (0, 0, 0),
-        (1, 0, 0),
-        (5, 5, 1),
-        (10, 990, 99),
-        (245, 238, 0)
-    ],
+    [(0, 0, 0), (1, 0, 0), (5, 5, 1), (10, 990, 99), (245, 238, 0)],  # noqa: WPS221
 )
 def test_num_page(limit, offset, expected_page):
     pagination = Pagination(limit=limit, offset=offset, total=5)