diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts index 409b4bd01bd2..0b3550f4bbf8 100644 --- a/client/src/api/schema/schema.ts +++ b/client/src/api/schema/schema.ts @@ -8755,7 +8755,7 @@ export interface components { user_email?: string | null; /** * User Id - * @description User ID of user that ran ran job + * @description User ID of user that ran this job */ user_id?: string | null; }; @@ -16184,7 +16184,7 @@ export interface components { user_email?: string | null; /** * User Id - * @description User ID of user that ran ran job + * @description User ID of user that ran this job */ user_id?: string | null; }; diff --git a/lib/galaxy/schema/jobs.py b/lib/galaxy/schema/jobs.py index 6b785b904093..44cc5061619c 100644 --- a/lib/galaxy/schema/jobs.py +++ b/lib/galaxy/schema/jobs.py @@ -191,7 +191,7 @@ class EncodedJobDetails(JobSummary): title="Output collections", description="", ) - user_id: Optional[EncodedDatabaseIdField] = Field(default=None, description="User ID of user that ran ran job") + user_id: Optional[EncodedDatabaseIdField] = Field(default=None, description="User ID of user that ran this job") class JobDestinationParams(Model): diff --git a/lib/galaxy_test/base/api.py b/lib/galaxy_test/base/api.py index 057d0bf3000d..b1881f917b63 100644 --- a/lib/galaxy_test/base/api.py +++ b/lib/galaxy_test/base/api.py @@ -147,7 +147,7 @@ def _setup_user_get_key(self, email, password=None): return user, self._post(f"users/{user['id']}/api_key", admin=True).json() @contextmanager - def _different_user(self, email: Optional[str] = OTHER_USER, anon=False): + def _different_user(self, email: Optional[str] = None, anon=False): """Use in test cases to switch get/post operations to act as new user ..code-block:: python @@ -156,7 +156,6 @@ def _different_user(self, email: Optional[str] = OTHER_USER, anon=False): self._get("histories") # Gets other_user@bx.psu.edu histories. """ - email = OTHER_USER if email is None else email original_api_key = self.user_api_key original_interactor_key = self.galaxy_interactor.api_key original_cookies = self.galaxy_interactor.cookies @@ -165,6 +164,7 @@ def _different_user(self, email: Optional[str] = OTHER_USER, anon=False): self.galaxy_interactor.cookies = cookies new_key = None else: + email = OTHER_USER if email is None else email _, new_key = self._setup_user_get_key(email) try: self.user_api_key = new_key