Improve user_id description, set email where needed

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;
         };

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):

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 [email protected] 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