Explorar el Código

more x-browser fixes

Adam Shaw hace 7 años
padre
commit
b407f762d4
Se han modificado 2 ficheros con 8 adiciones y 5 borrados
  1. 7 4
      tests/automated/legacy/event-resize.js
  2. 1 1
      tests/automated/legacy/locale.js

+ 7 - 4
tests/automated/legacy/event-resize.js

@@ -196,12 +196,15 @@ describe('eventResize', function() {
             setTimeout(function() { // wait for scroll to init, so don't do a rescroll which kills drag
               $('.fc-event').simulate('drag', {
                 isTouch: true,
+                localPoint: { left: '50%', top: '90%' },
                 delay: 200,
                 onRelease: function() {
-                  $('.fc-event .fc-resizer').simulate('drag', {
-                    dy: $('.fc-slats tr:eq(1)').height() * 4.5, // 5 slots, so 2.5 hours
-                    isTouch: true
-                  })
+                  setTimeout(function() { // for FF
+                    $('.fc-event .fc-resizer').simulate('drag', {
+                      dy: $('.fc-slats tr:eq(1)').height() * 4.5, // 5 slots, so 2.5 hours
+                      isTouch: true,
+                    })
+                  }, 0)
                 }
               })
             }, 0)

+ 1 - 1
tests/automated/legacy/locale.js

@@ -11,7 +11,7 @@ describe('locale', function() {
     })
     expect(
       $('.fc-day-header:first').text()
-    ).toMatch(/^Sun\.? 12[- ]21$/)
+    ).toMatch(/^Sun\.? 12[-/ ]21$/)
     expect($('.fc-event .fc-time')).toHaveText('10:00')
   })