Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit ede2f5f

Browse files
author
Gabriel Schulhof
committed
Tests: Fix errors and visual glitches seen in Chrome
(cherry picked from commit 797516a) Closes gh-7508 Fixes gh-7499
1 parent b068128 commit ede2f5f

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed
Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
11
$.testHelper.setPushState();
22

3-
(function( $ ) {
4-
module( "beforenavigate", {
5-
setup: function() {
6-
location.hash = "";
7-
},
8-
9-
teardown: function() {
10-
$( window ).unbind( "beforenavigate" );
11-
}
12-
});
3+
asyncTest( "changes to the url trigger a beforenavigate", function() {
134

14-
asyncTest( "changes to the url trigger a beforenavigate", function() {
15-
setTimeout( function() {
16-
ok( false, "beforenavigate should have been triggered" );
17-
start();
18-
}, 3000 );
19-
$( window ).one( "beforenavigate", function( event, data ) {
20-
ok( true, "beforenavigate should have been triggered" );
5+
$.testHelper.detailedEventCascade([
6+
function() {
7+
location.hash = "foo";
8+
},
9+
{
10+
beforenavigate: { src: $( window ), event: "beforenavigate.changesToUrlTrigger1" }
11+
},
12+
function( result ) {
13+
deepEqual( result.beforenavigate.timedOut, false,
14+
"beforenavigate event was triggered" );
2115
start();
22-
});
23-
24-
location.hash = "foo";
25-
});
26-
27-
})( jQuery );
16+
}
17+
]);
18+
});

tests/integration/navigation/navigation_core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ $.testHelper.delayStart();
229229
function(){
230230
$.mobile.changePage = newChangePage;
231231

232-
$('#non-ajax-form').one('submit', function(event){
232+
$('#non-ajax-form').one('submit', function(event){
233233
ok(true, 'submit callbacks are fired');
234234
event.preventDefault();
235235
}).submit();

tests/integration/navigation/sequence/sequence-redirect.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<script src="../../../jquery.setNameSpace.js"></script>
1717
<script src="../../../jquery.testHelper.js"></script>
1818
<script src="../../../../external/qunit/qunit.js"></script>
19+
<link rel="stylesheet" href="../../../jqm-tests.css"/>
1920
<script>
2021
$.testHelper.asyncLoad([
2122
[

tests/jqm-tests.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,11 @@
22
position: absolute !important;
33
top: -10000px !important;
44
}
5+
6+
[data-nstest-role='header'][data-nstest-position='fixed'] {
7+
top: -10000px !important;
8+
}
9+
10+
[data-nstest-role='footer'][data-nstest-position='fixed'] {
11+
left: -10000px !important;
12+
}

0 commit comments

Comments
 (0)