Explorar o código

Fix race condition in test

JC Brand %!s(int64=4) %!d(string=hai) anos
pai
achega
623deac3ec
Modificáronse 2 ficheiros con 3 adicións e 2 borrados
  1. 1 1
      spec/emojis.js
  2. 2 1
      src/plugins/chatview/bottom-panel.js

+ 1 - 1
spec/emojis.js

@@ -50,7 +50,7 @@ describe("Emojis", function () {
             }
             }
             const bottom_panel = view.querySelector('converse-muc-bottom-panel');
             const bottom_panel = view.querySelector('converse-muc-bottom-panel');
             bottom_panel.onKeyDown(tab_event);
             bottom_panel.onKeyDown(tab_event);
-            await u.waitUntil(() => view.querySelector('converse-emoji-picker .emoji-search').value === ':gri');
+            await u.waitUntil(() => view.querySelector('converse-emoji-picker .emoji-search')?.value === ':gri');
             await u.waitUntil(() =>  sizzle('.emojis-lists__container--search .insert-emoji', view).length === 3, 1000);
             await u.waitUntil(() =>  sizzle('.emojis-lists__container--search .insert-emoji', view).length === 3, 1000);
             let visible_emojis = sizzle('.emojis-lists__container--search .insert-emoji', view);
             let visible_emojis = sizzle('.emojis-lists__container--search .insert-emoji', view);
             expect(visible_emojis[0].getAttribute('data-emoji')).toBe(':grimacing:');
             expect(visible_emojis[0].getAttribute('data-emoji')).toBe(':grimacing:');

+ 2 - 1
src/plugins/chatview/bottom-panel.js

@@ -253,7 +253,8 @@ export default class ChatBottomPanel extends ElementView {
         this.insertIntoTextArea('', true, false);
         this.insertIntoTextArea('', true, false);
     }
     }
 
 
-    autocompleteInPicker (input, value) {
+    async autocompleteInPicker (input, value) {
+        await api.emojis.initialize();
         const emoji_dropdown = this.querySelector('converse-emoji-dropdown');
         const emoji_dropdown = this.querySelector('converse-emoji-dropdown');
         const emoji_picker = this.querySelector('converse-emoji-picker');
         const emoji_picker = this.querySelector('converse-emoji-picker');
         if (emoji_picker && emoji_dropdown) {
         if (emoji_picker && emoji_dropdown) {