Răsfoiți Sursa

Fix last failing tests.

JC Brand 11 ani în urmă
părinte
comite
c3dcbbc660
2 a modificat fișierele cu 4 adăugiri și 11 ștergeri
  1. 2 7
      spec/chatbox.js
  2. 2 4
      spec/chatroom.js

+ 2 - 7
spec/chatbox.js

@@ -515,15 +515,10 @@
                         expect($count.html()).toBe('2');
                         trimmedview.$el.find('.restore-chat').click();
                     }, converse));
-                    waits(50);
+                    waits(250);
                     runs($.proxy(function () {
                         var trimmed_chatboxes = this.minimized_chats;
-                        var trimmedview = trimmed_chatboxes.get(contact_jid);
-                        var $count = trimmedview.$el.find('.chat-head-message-count');
-                        expect(trimmedview.model.get('minimized')).toBeFalsy();
-                        expect($count.is(':visible')).toBeFalsy();
-                        expect($count.data('count')).toBeFalsy();
-                        expect($count.html()).toBe('0');
+                        expect(trimmed_chatboxes.keys().length).toBe(0);
                     }, converse));
                 }, converse));
 

+ 2 - 4
spec/chatroom.js

@@ -141,8 +141,7 @@
 
             it("can be minimized by clicking a DOM element with class 'toggle-chatbox-button'", function () {
                 var view = this.chatboxviews.get('lounge@muc.localhost'),
-                    trimmed_chatboxes = this.chatboxviews.trimmed_chatboxes_view;
-
+                    trimmed_chatboxes = this.minimized_chats;
                 spyOn(view, 'minimize').andCallThrough();
                 spyOn(view, 'maximize').andCallThrough();
                 spyOn(converse, 'emit');
@@ -158,11 +157,10 @@
                     expect(view.$el.is(':visible')).toBeFalsy();
                     expect(view.model.get('minimized')).toBeTruthy();
                     expect(view.minimize).toHaveBeenCalled();
-
                     trimmedview = trimmed_chatboxes.get(view.model.get('id'));
                     trimmedview.$("a.restore-chat").click();
                 });
-                waits(50);
+                waits(250);
                 runs(function () {
                     expect(view.maximize).toHaveBeenCalled();
                     expect(converse.emit).toHaveBeenCalledWith('onChatBoxMaximized', jasmine.any(Object));