From d723270388a06bfbcfcb589088447d5cf8aec4e6 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 22 Jul 2021 13:42:31 -0400
Subject: [PATCH] tests: Improve readability of `multipleUsers.js`

  * Define utility functions above their use to silence lint warnings.
  * Use `.css()` instead of `.attr('style')` to manipulate style.
  * Pass an object to `.attr()` rather than call once per attribute.
  * Take advantage of chaining.
  * Inline unnecessary `padUrl` variable.
  * Delete some unnecessary comments.
---
 src/tests/frontend/helper/multipleUsers.js | 48 ++++++++++------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/tests/frontend/helper/multipleUsers.js b/src/tests/frontend/helper/multipleUsers.js
index b4dfc9188..831bf403e 100644
--- a/src/tests/frontend/helper/multipleUsers.js
+++ b/src/tests/frontend/helper/multipleUsers.js
@@ -1,5 +1,21 @@
 'use strict';
 
+const getCookies =
+    () => helper.padChrome$.window.require('ep_etherpad-lite/static/js/pad_utils').Cookies;
+
+const setToken = (token) => getCookies().set('token', token);
+
+const getToken = () => getCookies().get('token');
+
+const startActingLike = (user) => {
+  helper.padChrome$ = user.padChrome$;
+  helper.padOuter$ = user.padOuter$;
+  helper.padInner$ = user.padInner$;
+  if (helper.padChrome$) setToken(user.token);
+};
+
+const clearToken = () => getCookies().remove('token');
+
 helper.multipleUsers = {
   _user0: null,
   _user1: null,
@@ -47,14 +63,11 @@ helper.multipleUsers = {
   },
 
   async _createUser1Frame() {
-    // create the iframe
-    const padUrl = this._user0.$frame.attr('src');
-    this._user1.$frame = $('<iframe>').attr('id', 'user1_pad').attr('src', padUrl);
-
-    // place one iframe (visually) below the other
-    this._user0.$frame.attr('style', 'height: 50%');
-    this._user1.$frame.attr('style', 'height: 50%; top: 50%');
-    this._user1.$frame.insertAfter(this._user0.$frame);
+    this._user0.$frame.css({height: '50%'});
+    this._user1.$frame = $('<iframe>')
+        .attr({id: 'user1_pad', src: this._user0.$frame.attr('src')})
+        .css({height: '50%', top: '50%'})
+        .insertAfter(this._user0.$frame);
 
     // wait for user1 pad to load
     await new Promise((resolve) => this._user1.$frame.one('load', resolve));
@@ -78,22 +91,3 @@ helper.multipleUsers = {
     }
   },
 };
-
-const getCookies =
-    () => helper.padChrome$.window.require('ep_etherpad-lite/static/js/pad_utils').Cookies;
-
-const setToken = (token) => getCookies().set('token', token);
-
-const getToken = () => getCookies().get('token');
-
-const startActingLike = (user) => {
-  // update helper references, so other methods will act as if the main frame
-  // was the one we're using from now on
-  helper.padChrome$ = user.padChrome$;
-  helper.padOuter$ = user.padOuter$;
-  helper.padInner$ = user.padInner$;
-
-  if (helper.padChrome$) setToken(user.token);
-};
-
-const clearToken = () => getCookies().remove('token');