diff --git a/src/specklepy/core/api/resources/other_user_resource.py b/src/specklepy/core/api/resources/other_user_resource.py index d82513b..90ab175 100644 --- a/src/specklepy/core/api/resources/other_user_resource.py +++ b/src/specklepy/core/api/resources/other_user_resource.py @@ -138,12 +138,13 @@ class OtherUserResource(ResourceBase): query UserSearch($search_query: String!, $limit: Int!) { userSearch(query: $search_query, limit: $limit) { items { - id - name - bio - company - avatar - verified + id + name + bio + company + avatar + verified + role } } } diff --git a/tests/integration/client/test_active_user.py b/tests/integration/client/test_active_user.py index ffc3917..3e94652 100644 --- a/tests/integration/client/test_active_user.py +++ b/tests/integration/client/test_active_user.py @@ -7,7 +7,6 @@ from specklepy.core.api.inputs.user_inputs import UserUpdateInput from specklepy.logging.exceptions import GraphQLException -@deprecated @pytest.mark.run(order=2) class TestUser: def test_user_get_self(self, client: SpeckleClient, user_dict): diff --git a/tests/integration/client/test_active_user_resource.py b/tests/integration/client/test_active_user_resource.py index dc11056..4478ad9 100644 --- a/tests/integration/client/test_active_user_resource.py +++ b/tests/integration/client/test_active_user_resource.py @@ -4,7 +4,7 @@ from specklepy.core.api.client import SpeckleClient from specklepy.core.api.inputs.project_inputs import ProjectCreateInput from specklepy.core.api.inputs.user_inputs import UserUpdateInput from specklepy.core.api.models import User -from specklepy.core.api.responses import ResourceCollection +from specklepy.core.api.new_models import ResourceCollection @pytest.mark.run() diff --git a/tests/integration/client/test_branch.py b/tests/integration/client/test_branch.py index cd6d388..075ae9f 100644 --- a/tests/integration/client/test_branch.py +++ b/tests/integration/client/test_branch.py @@ -6,7 +6,6 @@ from specklepy.api.models import Branch, Commit, Stream from specklepy.transports.server import ServerTransport -@deprecated class TestBranch: @pytest.fixture(scope="module") def branch(self): diff --git a/tests/integration/client/test_commit.py b/tests/integration/client/test_commit.py index 94a9738..4a664d4 100644 --- a/tests/integration/client/test_commit.py +++ b/tests/integration/client/test_commit.py @@ -6,7 +6,6 @@ from specklepy.api.models import Commit, Stream from specklepy.transports.server.server import ServerTransport -@deprecated @pytest.mark.run(order=6) class TestCommit: @pytest.fixture(scope="module") diff --git a/tests/integration/client/test_model_resource.py b/tests/integration/client/test_model_resource.py index 72b64ce..6295a96 100644 --- a/tests/integration/client/test_model_resource.py +++ b/tests/integration/client/test_model_resource.py @@ -8,8 +8,7 @@ from specklepy.core.api.inputs.model_inputs import ( ) from specklepy.core.api.inputs.project_inputs import ProjectCreateInput from specklepy.core.api.models import Model, Project -from specklepy.core.api.new_models import ProjectWithModels -from specklepy.core.api.responses import ResourceCollection +from specklepy.core.api.new_models import ProjectWithModels, ResourceCollection from specklepy.logging.exceptions import GraphQLException diff --git a/tests/integration/client/test_objects.py b/tests/integration/client/test_objects.py index 2631a53..7c07b14 100644 --- a/tests/integration/client/test_objects.py +++ b/tests/integration/client/test_objects.py @@ -8,7 +8,6 @@ from specklepy.serialization.base_object_serializer import BaseObjectSerializer from specklepy.transports.sqlite import SQLiteTransport -@deprecated class TestObject: @pytest.fixture(scope="module") def stream(self, client): diff --git a/tests/integration/client/test_other_user.py b/tests/integration/client/test_other_user.py index 5e79a57..9394e19 100644 --- a/tests/integration/client/test_other_user.py +++ b/tests/integration/client/test_other_user.py @@ -5,7 +5,6 @@ from specklepy.api.client import SpeckleClient from specklepy.api.models import Activity, ActivityCollection, LimitedUser -@deprecated() @pytest.mark.run(order=4) class TestOtherUser: def test_user_get_self(self, client): @@ -15,7 +14,7 @@ class TestOtherUser: with pytest.raises(TypeError): client.other_user.get() - def test_user_search(self, client, second_user_dict): + def test_user_search(self, client: SpeckleClient, second_user_dict): search_results = client.other_user.search( search_query=second_user_dict["name"][:5] ) @@ -29,7 +28,7 @@ class TestOtherUser: second_user_dict["id"] = result_user.id assert getattr(result_user, "email", None) is None - def test_user_get(self, client, second_user_dict): + def test_user_get(self, client: SpeckleClient, second_user_dict): fetched_user = client.other_user.get(id=second_user_dict["id"]) assert isinstance(fetched_user, LimitedUser) diff --git a/tests/integration/client/test_stream.py b/tests/integration/client/test_stream.py index b894bf9..87f5b72 100644 --- a/tests/integration/client/test_stream.py +++ b/tests/integration/client/test_stream.py @@ -12,7 +12,6 @@ from specklepy.api.models import ( from specklepy.logging.exceptions import GraphQLException, SpeckleException -@deprecated @pytest.mark.run(order=3) class TestStream: @pytest.fixture(scope="session") diff --git a/tests/integration/client/test_user.py b/tests/integration/client/test_user.py index 0eb141c..a87ae6d 100644 --- a/tests/integration/client/test_user.py +++ b/tests/integration/client/test_user.py @@ -6,7 +6,6 @@ from specklepy.api.models import Activity, ActivityCollection, User from specklepy.logging.exceptions import SpeckleException -@deprecated @pytest.mark.run(order=1) class TestUser: def test_user_get_self(self, client: SpeckleClient, user_dict):