DEV: Bump eslint-config-discourse (#14868)

Changes for 4f7aba06c0

Also fixes all of the object-shorthand violations in our JS code.

app/assets/javascripts/admin/addon/components/admin-backups-logs.js

@@ -48,7 +48,7 @@ export default Component.extend({
     }
     // update the formatted logs & cache index
     this.setProperties({
-      formattedLogs: formattedLogs,
+      formattedLogs,
       index: logs.length,
     });
     // force rerender

app/assets/javascripts/admin/addon/components/admin-graph.js

@@ -24,7 +24,7 @@ export default Component.extend({
 
     const config = {
       type: this.type,
-      data: data,
+      data,
       options: {
         responsive: true,
         plugins: {

app/assets/javascripts/admin/addon/components/secret-value-list.js

@@ -63,7 +63,7 @@ export default Component.extend({
   },
 
   _addValue(value, secret) {
-    this.collection.addObject({ key: value, secret: secret });
+    this.collection.addObject({ key: value, secret });
     this._saveValues();
   },
 

app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js

@@ -121,7 +121,7 @@ export default Controller.extend({
     },
 
     filterBySubject(subject) {
-      this.changeFilters({ subject: subject });
+      this.changeFilters({ subject });
     },
 
     exportStaffActionLogs() {

app/assets/javascripts/admin/addon/controllers/admin-user-badges.js

@@ -49,7 +49,7 @@ export default Controller.extend(GrantBadgeController, {
       let result = {
         badge: badges[0].badge,
         granted_at: lastGranted,
-        badges: badges,
+        badges,
         count: badges.length,
         grouped: true,
       };

app/assets/javascripts/admin/addon/controllers/admin-user-index.js

@@ -592,7 +592,7 @@ export default Controller.extend(CanCheckEmails, {
                 (deletedPosts * 100) / user.get("post_count")
               );
               progressModal.setProperties({
-                deletedPercentage: deletedPercentage,
+                deletedPercentage,
               });
               performDelete(progressModal);
             }

app/assets/javascripts/admin/addon/models/permalink.js

@@ -35,11 +35,11 @@ const Permalink = EmberObject.extend({
 
 Permalink.reopenClass({
   findAll: function (filter) {
-    return ajax("/admin/permalinks.json", { data: { filter: filter } }).then(
+    return ajax("/admin/permalinks.json", { data: { filter } }).then(function (
-      function (permalinks) {
+      permalinks
-        return permalinks.map((p) => Permalink.create(p));
+    ) {
-      }
+      return permalinks.map((p) => Permalink.create(p));
-    );
+    });
   },
 });
 

app/assets/javascripts/admin/addon/models/report.js

@@ -672,7 +672,7 @@ Report.reopenClass({
         Report.fillMissingDates(json.report);
       }
 
-      const model = Report.create({ type: type });
+      const model = Report.create({ type });
       model.setProperties(json.report);
 
       if (json.report.related_report) {

app/assets/javascripts/admin/addon/models/screened-ip-address.js

@@ -42,7 +42,7 @@ const ScreenedIpAddress = EmberObject.extend({
 ScreenedIpAddress.reopenClass({
   findAll(filter) {
     return ajax("/admin/logs/screened_ip_addresses.json", {
-      data: { filter: filter },
+      data: { filter },
     }).then((screened_ips) =>
       screened_ips.map((b) => ScreenedIpAddress.create(b))
     );

app/assets/javascripts/admin/addon/models/web-hook.js

@@ -44,7 +44,7 @@ export default RestModel.extend({
   },
 
   groupFinder(term) {
-    return Group.findAll({ term: term, ignore_automatic: false });
+    return Group.findAll({ term, ignore_automatic: false });
   },
 
   @discourseComputed("wildcard_web_hook", "web_hook_event_types.[]")

app/assets/javascripts/admin/addon/routes/admin-badges.js

@@ -32,7 +32,7 @@ export default DiscourseRoute.extend({
     });
 
     controller.setProperties({
-      badgeGroupings: badgeGroupings,
+      badgeGroupings,
       badgeTypes: json.badge_types,
       protectedSystemFields: json.admin_badges.protected_system_fields,
       badgeTriggers,

app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js

@@ -39,8 +39,8 @@ export default Route.extend({
     });
 
     controller.setProperties({
-      model: model,
+      model,
-      parentController: parentController,
+      parentController,
       allThemes: parentController.get("model"),
       colorSchemeId: model.get("color_scheme_id"),
       colorSchemes: parentController.get("model.extras.color_schemes"),

app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js

@@ -24,7 +24,7 @@ export default Route.extend({
     controller.setProperties({
       siteText,
       saved: false,
-      localeFullName: localeFullName,
+      localeFullName,
     });
   },
 });

app/assets/javascripts/discourse/app/components/composer-editor.js

@@ -550,7 +550,7 @@ export default Component.extend(ComposerUpload, {
         if (found.indexOf(name) === -1) {
           this.groupsMentioned([
             {
-              name: name,
+              name,
               user_count: $e.data("mentionable-user-count"),
               max_mentions: $e.data("max-mentions"),
             },

app/assets/javascripts/discourse/app/components/composer-messages.js

@@ -83,7 +83,7 @@ export default Component.extend({
           !topic.archived &&
           !topic.closed &&
           !topic.deleted,
-        topic: topic,
+        topic,
       });
     },
 

app/assets/javascripts/discourse/app/components/suggested-topics.js

@@ -37,12 +37,12 @@ export default Component.extend({
     const inboxFilter = suggestedGroupName ? "group" : "user";
 
     const unreadCount = this.pmTopicTrackingState.lookupCount("unread", {
-      inboxFilter: inboxFilter,
+      inboxFilter,
       groupName: suggestedGroupName,
     });
 
     const newCount = this.pmTopicTrackingState.lookupCount("new", {
-      inboxFilter: inboxFilter,
+      inboxFilter,
       groupName: suggestedGroupName,
     });
 
@@ -54,7 +54,7 @@ export default Component.extend({
           BOTH: hasBoth,
           UNREAD: unreadCount,
           NEW: newCount,
-          username: username,
+          username,
           groupName: suggestedGroupName,
           groupLink: this._groupLink(username, suggestedGroupName),
           basePath: getURL(""),

app/assets/javascripts/discourse/app/controllers/email-login.js

@@ -37,7 +37,7 @@ export default Controller.extend({
       ajax({
         url: `/session/email-login/${this.model.token}`,
         type: "POST",
-        data: data,
+        data,
       })
         .then((result) => {
           if (result.success) {

app/assets/javascripts/discourse/app/controllers/grant-badge.js

@@ -48,8 +48,8 @@ export default Controller.extend(ModalFunctionality, GrantBadgeController, {
       UserBadge.findByUsername(this.get("post.username")),
     ]).then(([allBadges, userBadges]) => {
       this.setProperties({
-        allBadges: allBadges,
+        allBadges,
-        userBadges: userBadges,
+        userBadges,
         loading: false,
       });
     });

app/assets/javascripts/discourse/app/controllers/invites-show.js

@@ -83,7 +83,7 @@ export default Controller.extend(
 
     @discourseComputed("email")
     yourEmailMessage(email) {
-      return I18n.t("invites.your_email", { email: email });
+      return I18n.t("invites.your_email", { email });
     },
 
     @discourseComputed

app/assets/javascripts/discourse/app/controllers/login.js

@@ -273,9 +273,7 @@ export default Controller.extend(ModalFunctionality, {
       }
 
       this.set("loggingIn", true);
-      loginMethod
+      loginMethod.doLogin({ signup }).catch(() => this.set("loggingIn", false));
-        .doLogin({ signup: signup })
-        .catch(() => this.set("loggingIn", false));
     },
 
     createAccount() {

app/assets/javascripts/discourse/app/controllers/password-reset.js

@@ -121,7 +121,7 @@ export default Controller.extend(PasswordValidation, {
           this.setProperties({
             securityKeyRequired: true,
             password: null,
-            errorMessage: errorMessage,
+            errorMessage,
           });
         }
       );

app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js

@@ -73,7 +73,7 @@ export default Controller.extend(ModalFunctionality, {
           name: this.model.username_lower,
         },
         pubKeyCredParams: this.supported_algorithms.map((alg) => {
-          return { type: "public-key", alg: alg };
+          return { type: "public-key", alg };
         }),
         excludeCredentials: this.existing_active_credential_ids.map(
           (credentialId) => {

app/assets/javascripts/discourse/app/controllers/user-topics-list.js

@@ -60,7 +60,7 @@ export default Controller.extend(BulkTopicSelection, {
 
     const opts = {
       inbox: this.inbox,
-      topicIds: topicIds,
+      topicIds,
     };
 
     if (this.group) {

app/assets/javascripts/discourse/app/helpers/format-date.js

@@ -25,9 +25,9 @@ registerUnbound("format-date", function (val, params) {
     let date = new Date(val);
     return htmlSafe(
       autoUpdatingRelativeAge(date, {
-        format: format,
+        format,
-        title: title,
+        title,
-        leaveAgo: leaveAgo,
+        leaveAgo,
       })
     );
   }

app/assets/javascripts/discourse/app/helpers/user-avatar.js

@@ -72,7 +72,7 @@ function renderAvatar(user, options) {
       size: options.imageSize,
       extraClasses: get(user, "extras") || options.extraClasses,
       title: title || displayName,
-      avatarTemplate: avatarTemplate,
+      avatarTemplate,
     });
   } else {
     return "";

app/assets/javascripts/discourse/app/lib/ajax.js

@@ -110,7 +110,7 @@ export function ajax() {
       });
 
       if (args.returnXHR) {
-        data = { result: data, xhr: xhr };
+        data = { result: data, xhr };
       }
 
       run(null, resolve, data);
@@ -145,8 +145,8 @@ export function ajax() {
 
       run(null, reject, {
         jqXHR: xhr,
-        textStatus: textStatus,
+        textStatus,
-        errorThrown: errorThrown,
+        errorThrown,
       });
     };
 

app/assets/javascripts/discourse/app/lib/category-tag-search.js

@@ -32,7 +32,7 @@ function searchTags(term, categories, limit) {
         function () {
           oldSearch = $.ajax(getURL("/tags/filter/search"), {
             type: "GET",
-            data: { limit: limit, q },
+            data: { limit, q },
           });
 
           let returnVal = CANCELLED_STATUS;

app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js

@@ -27,10 +27,10 @@ export function extractLinkMeta(topic) {
   }
 
   const meta = {
-    target: target,
+    target,
     href,
-    domain: domain,
+    domain,
-    rel: rel,
+    rel,
   };
 
   if (_decorators.length) {

app/assets/javascripts/discourse/app/lib/screen-track.js

@@ -147,7 +147,7 @@ export default class {
 
     const { timings, topicTime, topicId } = this._consolidatedTimings.pop();
     const data = {
-      timings: timings,
+      timings,
       topic_time: topicTime,
       topic_id: topicId,
     };

app/assets/javascripts/discourse/app/lib/search.js

@@ -143,7 +143,7 @@ export function searchForTerm(term, opts) {
   }
 
   // Only include the data we have
-  const data = { term: term };
+  const data = { term };
   if (opts.typeFilter) {
     data.type_filter = opts.typeFilter;
   }

app/assets/javascripts/discourse/app/lib/user-search.js

@@ -55,7 +55,7 @@ function performSearch(
   }
 
   let data = {
-    term: term,
+    term,
     topic_id: topicId,
     category_id: categoryId,
     include_groups: includeGroups,
@@ -65,7 +65,7 @@ function performSearch(
     topic_allowed_users: allowedUsers,
     include_staged_users: includeStagedUsers,
     last_seen_users: lastSeenUsers,
-    limit: limit,
+    limit,
   };
 
   if (customUserSearchOptions) {

app/assets/javascripts/discourse/app/lib/utilities.js

@@ -99,9 +99,7 @@ export function avatarImg(options, customGetURL) {
 }
 
 export function tinyAvatar(avatarTemplate, options) {
-  return avatarImg(
+  return avatarImg(deepMerge({ avatarTemplate, size: "tiny" }, options));
-    deepMerge({ avatarTemplate: avatarTemplate, size: "tiny" }, options)
-  );
 }
 
 export function postUrl(slug, topicId, postNumber) {
@@ -219,7 +217,7 @@ export function caretRowCol(el) {
       return sum + row.length + 1;
     }, 0);
 
-  return { rowNum: rowNum, colNum: colNum };
+  return { rowNum, colNum };
 }
 
 // Determine the position of the caret in an element

app/assets/javascripts/discourse/app/lib/webauthn.js

@@ -38,7 +38,7 @@ export function getWebauthnCredential(
     .get({
       publicKey: {
         challenge: challengeBuffer,
-        allowCredentials: allowCredentials,
+        allowCredentials,
         timeout: 60000,
 
         // see https://chromium.googlesource.com/chromium/src/+/master/content/browser/webauth/uv_preferred.md for why

app/assets/javascripts/discourse/app/mixins/open-composer.js

@@ -53,7 +53,7 @@ export default Mixin.create({
       topicBody,
       archetypeId: "private_message",
       draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
-      hasGroups: hasGroups,
+      hasGroups,
     });
   },
 });

app/assets/javascripts/discourse/app/models/bookmark.js

@@ -157,7 +157,7 @@ const Bookmark = RestModel.extend({
     return User.create({
       username: post_user_username,
       avatar_template: avatarTemplate,
-      name: name,
+      name,
     });
   },
 });

app/assets/javascripts/discourse/app/models/nav-item.js

@@ -28,7 +28,7 @@ const NavItem = EmberObject.extend({
       count = 0;
     }
 
-    let extra = { count: count };
+    let extra = { count };
     const titleKey = count === 0 ? ".title" : ".title_with_count";
 
     return emojiUnescape(

app/assets/javascripts/discourse/app/models/post-stream.js

@@ -549,7 +549,7 @@ export default RestModel.extend({
 
     post.setProperties({
       post_number: topic.get("highest_post_number"),
-      topic: topic,
+      topic,
       created_at: new Date(),
       id: -1,
     });
@@ -1063,7 +1063,7 @@ export default RestModel.extend({
     const url = `/t/${this.get("topic.id")}/posts.json`;
     let data = {
       post_number: postNumber,
-      asc: asc,
+      asc,
       include_suggested: includeSuggested,
     };
 

app/assets/javascripts/discourse/app/models/post.js

@@ -219,7 +219,7 @@ const Post = RestModel.extend({
           : "post.deleted_by_author_simple";
       promise = cookAsync(I18n.t(key)).then((cooked) => {
         this.setProperties({
-          cooked: cooked,
+          cooked,
           can_delete: false,
           can_permanently_delete: false,
           version: this.version + 1,

app/assets/javascripts/discourse/app/models/topic-details.js

@@ -49,7 +49,7 @@ const TopicDetails = RestModel.extend({
 
     return ajax("/t/" + this.get("topic.id") + "/remove-allowed-group", {
       type: "PUT",
-      data: { name: name },
+      data: { name },
     }).then(() => {
       groups.removeObject(groups.findBy("name", name));
     });
@@ -61,7 +61,7 @@ const TopicDetails = RestModel.extend({
 
     return ajax("/t/" + this.get("topic.id") + "/remove-allowed-user", {
       type: "PUT",
-      data: { username: username },
+      data: { username },
     }).then(() => {
       users.removeObject(users.findBy("username", username));
     });

app/assets/javascripts/discourse/app/models/user-badge.js

@@ -155,9 +155,9 @@ UserBadge.reopenClass({
     return ajax("/user_badges", {
       type: "POST",
       data: {
-        username: username,
+        username,
         badge_id: badgeId,
-        reason: reason,
+        reason,
       },
     }).then(function (json) {
       return UserBadge.createFromJson(json);

app/assets/javascripts/discourse/app/models/user.js

@@ -382,7 +382,7 @@ const User = RestModel.extend({
     // TODO: We can remove this when migrated fully to rest model.
     this.set("isSaving", true);
     return ajax(userPath(`${this.username_lower}.json`), {
-      data: data,
+      data,
       type: "PUT",
     })
       .then((result) => {
@@ -1037,7 +1037,7 @@ User.reopenClass(Singleton, {
 
   // Find a `User` for a given username.
   findByUsername(username, options) {
-    const user = User.create({ username: username });
+    const user = User.create({ username });
     return user.findDetails(options);
   },
 

app/assets/javascripts/discourse/app/routes/build-category-route.js

@@ -151,9 +151,9 @@ export default (filterArg, params) => {
           canCreateTopic && category.get("permission") === PermissionType.FULL;
 
       this.controllerFor("navigation/category").setProperties({
-        canCreateTopicOnCategory: canCreateTopicOnCategory,
+        canCreateTopicOnCategory,
         cannotCreateTopicOnCategory: !canCreateTopicOnCategory,
-        canCreateTopic: canCreateTopic,
+        canCreateTopic,
       });
 
       let topicOpts = {
@@ -165,8 +165,8 @@ export default (filterArg, params) => {
         selected: [],
         noSubcategories: params && !!params.no_subcategories,
         expandAllPinned: true,
-        canCreateTopic: canCreateTopic,
+        canCreateTopic,
-        canCreateTopicOnCategory: canCreateTopicOnCategory,
+        canCreateTopicOnCategory,
       };
 
       const p = category.get("params");

app/assets/javascripts/discourse/app/routes/build-private-messages-group-route.js

@@ -61,7 +61,7 @@ export default (inboxType, filter) => {
         .get("groups")
         .filterBy("name", groupName)[0];
 
-      this.setProperties({ groupName: groupName, group });
+      this.setProperties({ groupName, group });
     },
 
     setupController() {

app/assets/javascripts/discourse/app/routes/build-private-messages-route.js

@@ -67,7 +67,7 @@ export default (inboxType, path, filter) => {
         tagsForUser: this.modelFor("user").get("username_lower"),
         selected: [],
         showToggleBulkSelect: true,
-        filter: filter,
+        filter,
         group: null,
         inbox: inboxType,
       });

app/assets/javascripts/discourse/app/routes/discovery.js

@@ -30,7 +30,7 @@ export default DiscourseRoute.extend(OpenComposer, {
       const period = User.currentProp("redirected_to_top.period") || "all";
       this.replaceWith("discovery.top", {
         queryParams: {
-          period: period,
+          period,
         },
       });
     } else if (url && (matches = url.match(/top\/(.*)$/))) {

app/assets/javascripts/discourse/app/routes/preferences-email.js

@@ -14,7 +14,7 @@ export default RestrictedUserRoute.extend({
   setupController: function (controller, model) {
     controller.reset();
     controller.setProperties({
-      model: model,
+      model,
       oldEmail: controller.new ? "" : model.get("email"),
       newEmail: controller.new ? "" : model.get("email"),
     });

app/assets/javascripts/discourse/app/routes/tag-show.js

@@ -221,7 +221,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
 
       if (categoryId) {
         options = $.extend({}, options, {
-          categoryId: categoryId,
+          categoryId,
           includeSubcategories: !controller.noSubcategories,
         });
       }

app/assets/javascripts/discourse/app/routes/user-notifications.js

@@ -24,7 +24,7 @@ export default DiscourseRoute.extend(ViewingActionType, {
       this.get("currentUser.admin")
     ) {
       return this.store.find("notification", {
-        username: username,
+        username,
         filter: params.filter,
       });
     }

app/assets/javascripts/discourse/app/services/presence.js

@@ -355,7 +355,7 @@ export default class PresenceService extends Service {
     this._queuedEvents.push({
       channel: channelName,
       type: "enter",
-      promiseProxy: promiseProxy,
+      promiseProxy,
     });
 
     this._scheduleNextUpdate();
@@ -384,7 +384,7 @@ export default class PresenceService extends Service {
     this._queuedEvents.push({
       channel: channelName,
       type: "leave",
-      promiseProxy: promiseProxy,
+      promiseProxy,
     });
 
     this._scheduleNextUpdate();

app/assets/javascripts/discourse/app/widgets/home-logo.js

@@ -103,7 +103,7 @@ export default createWidget("home-logo", {
         : { src: getURL(url), alt: title };
 
     const imgElement = h(`img#site-logo.${key}`, {
-      key: key,
+      key,
       attributes,
     });
 

app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js

@@ -38,9 +38,9 @@ function preloadInvite({
       title: "team",
     },
     username: "invited",
-    email_verified_by_link: email_verified_by_link,
+    email_verified_by_link,
-    different_external_email: different_external_email,
+    different_external_email,
-    hidden_email: hidden_email,
+    hidden_email,
   };
 
   if (link) {

app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js

@@ -24,7 +24,7 @@ async function triggerSwipeStart(touchTarget) {
   );
 
   const touchStart = {
-    touchTarget: touchTarget,
+    touchTarget,
     x:
       zoom *
       (touchTarget.getBoundingClientRect().x +

app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js

@@ -123,7 +123,7 @@ acceptance(
 
           return helper.response({
             topic_list: {
-              topics: topics,
+              topics,
             },
           });
         });

app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js

@@ -8,7 +8,7 @@ import hbs from "htmlbars-inline-precompile";
 
 const createArgs = (topic) => {
   return {
-    topic: topic,
+    topic,
     openUpwards: "true",
     toggleMultiSelect: () => {},
     deleteTopic: () => {},

app/assets/javascripts/discourse/tests/setup-tests.js

@@ -149,7 +149,7 @@ function writeSummaryLine(message) {
   if (window.Testem) {
     window.Testem.useCustomAdapter(function (socket) {
       socket.emit("test-metadata", "summary-line", {
-        message: message,
+        message,
       });
     });
   }

app/assets/javascripts/discourse/tests/test_starter.js

@@ -107,8 +107,8 @@ window.keyEvent = function (selector, contextOrType, typeOrKeyCode, keyCode) {
   let key = keyFromKeyCode[keyCode];
 
   return window.triggerEvent(selector, context, type, {
-    keyCode: keyCode,
+    keyCode,
     which: keyCode,
-    key: key,
+    key,
   });
 };

app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js

@@ -1011,7 +1011,7 @@ eviltrout</p>
       "[test.pdf|attachment](upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf)",
       {
         siteSettings: { secure_media: false },
-        lookupUploadUrls: lookupUploadUrls,
+        lookupUploadUrls,
       },
       `<p><a class="attachment" href="/uploads/short-url/blah">test.pdf</a></p>`,
       "It returns the correct attachment link HTML when the URL is mapped without secure media"
@@ -1033,7 +1033,7 @@ eviltrout</p>
       "[test.pdf|attachment](upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf)",
       {
         siteSettings: { secure_media: true },
-        lookupUploadUrls: lookupUploadUrls,
+        lookupUploadUrls,
       },
       `<p><a class="attachment" href="/secure-media-uploads/original/3X/c/b/o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf">test.pdf</a></p>`,
       "It returns the correct attachment link HTML when the URL is mapped with secure media"
@@ -1067,7 +1067,7 @@ eviltrout</p>
       "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
       {
         siteSettings: { secure_media: true },
-        lookupUploadUrls: lookupUploadUrls,
+        lookupUploadUrls,
       },
       `<p><div class="video-container">
     <video width="100%" height="100%" preload="metadata" controls>
@@ -1104,7 +1104,7 @@ eviltrout</p>
       "![baby shark|audio](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3)",
       {
         siteSettings: { secure_media: true },
-        lookupUploadUrls: lookupUploadUrls,
+        lookupUploadUrls,
       },
       `<p><audio preload="metadata" controls>
     <source src="/secure-media-uploads/original/3X/c/b/test.mp3">

app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js

@@ -103,14 +103,14 @@ discourseModule("Unit | Utilities", function () {
 
     let avatarTemplate = "/path/to/avatar/{size}.png";
     assert.strictEqual(
-      avatarImg({ avatarTemplate: avatarTemplate, size: "tiny" }),
+      avatarImg({ avatarTemplate, size: "tiny" }),
       "<img loading='lazy' alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar'>",
       "it returns the avatar html"
     );
 
     assert.strictEqual(
       avatarImg({
-        avatarTemplate: avatarTemplate,
+        avatarTemplate,
         size: "tiny",
         title: "evilest trout",
       }),
@@ -120,7 +120,7 @@ discourseModule("Unit | Utilities", function () {
 
     assert.strictEqual(
       avatarImg({
-        avatarTemplate: avatarTemplate,
+        avatarTemplate,
         size: "tiny",
         extraClasses: "evil fish",
       }),

app/assets/javascripts/discourse/tests/unit/models/category-test.js

@@ -39,7 +39,7 @@ module("Unit | Model | category", function () {
     slugFor(
       store.createRecord("category", {
         slug: "luke",
-        parentCategory: parentCategory,
+        parentCategory,
       }),
       "darth/luke",
       "it uses the parent slug before the child"
@@ -48,7 +48,7 @@ module("Unit | Model | category", function () {
     slugFor(
       store.createRecord("category", {
         id: 555,
-        parentCategory: parentCategory,
+        parentCategory,
       }),
       "darth/555-category",
       "it uses the parent slug before the child and then uses id"
@@ -58,7 +58,7 @@ module("Unit | Model | category", function () {
     slugFor(
       store.createRecord("category", {
         id: 555,
-        parentCategory: parentCategory,
+        parentCategory,
       }),
       "345-category/555-category",
       "it uses the parent before the child and uses ids for both"

app/assets/javascripts/discourse/tests/unit/models/composer-test.js

@@ -277,7 +277,7 @@ discourseModule("Unit | Model | composer", function () {
     assert.ok(!composer.get("editingFirstPost"), "it's false by default");
 
     const post = Post.create({ id: 123, post_number: 2 });
-    composer.setProperties({ post: post, action: EDIT });
+    composer.setProperties({ post, action: EDIT });
     assert.ok(
       !composer.get("editingFirstPost"),
       "it's false when not editing the first post"
@@ -337,7 +337,7 @@ discourseModule("Unit | Model | composer", function () {
         action: REPLY,
         draftKey: "asfd",
         draftSequence: 1,
-        quote: quote,
+        quote,
       });
     };
 
@@ -363,7 +363,7 @@ discourseModule("Unit | Model | composer", function () {
       post_number: 2,
       static_doc: true,
     });
-    composer.setProperties({ post: post, action: EDIT });
+    composer.setProperties({ post, action: EDIT });
 
     composer.set("title", "asdf");
     assert.ok(composer.get("titleLengthValid"), "admins can use short titles");

app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js

@@ -889,7 +889,7 @@ module("Unit | Model | post-stream", function () {
 
     [1, 2, 3, 5].forEach((id) => {
       postStream.appendPost(
-        store.createRecord("post", { id: id, post_number: id })
+        store.createRecord("post", { id, post_number: id })
       );
     });
 

app/assets/javascripts/discourse/tests/unit/models/post-test.js

@@ -59,7 +59,7 @@ module("Unit | Model | post", function () {
 
   test("destroy by staff", async function (assert) {
     let user = User.create({ username: "staff", moderator: true });
-    let post = buildPost({ user: user });
+    let post = buildPost({ user });
 
     await post.destroy(user);
 
@@ -85,7 +85,7 @@ module("Unit | Model | post", function () {
   test("destroy by non-staff", async function (assert) {
     const originalCooked = "this is the original cooked value";
     const user = User.create({ username: "evil trout" });
-    const post = buildPost({ user: user, cooked: originalCooked });
+    const post = buildPost({ user, cooked: originalCooked });
 
     await post.destroy(user);
 

app/assets/javascripts/discourse/tests/unit/models/user-test.js

@@ -22,7 +22,7 @@ module("Unit | Model | user", function () {
 
     assert.deepEqual(
       user.get("searchContext"),
-      { type: "user", id: "eviltrout", user: user },
+      { type: "user", id: "eviltrout", user },
       "has a search context"
     );
   });

package.json

@@ -23,7 +23,7 @@
     "chart.js": "3.5.1",
     "chartjs-plugin-datalabels": "^2.0.0",
     "diffhtml": "^1.0.0-beta.20",
-    "eslint-config-discourse": "^1.1.8",
+    "eslint-config-discourse": "^1.1.9",
     "handlebars": "^4.7.7",
     "jquery": "3.5.1",
     "jquery-color": "3.0.0-alpha.1",

yarn.lock

@@ -1492,10 +1492,10 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-discourse@^1.1.8:
+eslint-config-discourse@^1.1.9:
-  version "1.1.8"
+  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.8.tgz#c297831876811ea08203aa348d1ba2a963b2ae78"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.9.tgz#9a5ee6b3a4b986e5243f517e7945d1709c4e22df"
-  integrity sha512-ZSQfhliiO5Cfa7WcKoMkN4wW/1rBJpecpMJpfjiFsElfgPj4EV4Pzksi5CvFnRbJDoZh6DYYrQfO+tW062VOUA==
+  integrity sha512-a4KG+/9/7ZhYVV0URGK70K7QtxlydYKjie0ZssHEGxl2auOUTDcdRMBfZQBtIxQr9X8TF0+eeUUsScBXNU6xZw==
   dependencies:
     babel-eslint "^10.1.0"
     ember-template-lint "^2.11.0"