Skip to content

Commit 3dc9f97

Browse files
johnbenderjohnbender
committed
fixed second test for page caching
1 parent 3f20eaa commit 3dc9f97

File tree

3 files changed

+81
-27
lines changed

3 files changed

+81
-27
lines changed

‎tests/unit/listview/cache-tests/cached-nested.html‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
</head>
6+
<body>
7+
<div data-nstest-role="page" id='cached-nested-list' data-nstest-dom-cache="true">
8+
<div data-nstest-role="header" data-nstest-position="inline">
9+
<h1>Basic multiple lists view</h1>
10+
</div>
11+
<div data-nstest-role="content">
12+
<ul data-nstest-role="listview" data-nstest-inset="true" id="topmost">
13+
<li>Item 1</li>
14+
<li>Item 2</li>
15+
<li>Item 3
16+
<ul data-nstest-role="listview">
17+
<li>Item A-3-0</li>
18+
<li>Item A-3-1</li>
19+
<li>Item A-3-2</li>
20+
</ul>
21+
</li>
22+
</ul>
23+
<ul data-nstest-role="listview" data-nstest-inset="true">
24+
<li>Item 1</li>
25+
<li>Item 2</li>
26+
<li>Item 3
27+
<ul data-nstest-role="listview">
28+
<li>Item B-3-0
29+
<ul data-nstest-role="listview">
30+
<li>Item B-3-0-0</li>
31+
<li>Item B-3-0-1
32+
<ul data-nstest-role="listview">
33+
<li>Item B-3-0-1-0</li>
34+
<li>Item B-3-0-1-1</li>
35+
<li>Item B-3-0-1-2</li>
36+
</ul>
37+
</li>
38+
<li>Item B-3-0-2</li>
39+
</ul>
40+
</li>
41+
<li>Item B-3-1
42+
<ul data-nstest-role="listview">
43+
<li>Item B-3-1-0</li>
44+
<li>Item B-3-1-1</li>
45+
<li>Item B-3-1-2</li>
46+
</ul>
47+
</li>
48+
<li>Item B-3-2</li>
49+
</ul>
50+
</li>
51+
</ul>
52+
</div>
53+
</div>
54+
</body>
55+
</html>

tests/unit/listview/cache-tests/nested.html renamed to tests/unit/listview/cache-tests/uncached-nested.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
4+
<meta charset="utf-8">
55
</head>
66
<body>
7-
<div data-nstest-role="page" id='cached-nested-list'>
8-
<div data-nstest-role="header" data-nstest-position="inline">
9-
<h1>Basic multiple lists view</h1>
10-
</div>
7+
<div data-nstest-role="page" id='uncached-nested-list'>
8+
<div data-nstest-role="header" data-nstest-position="inline">
9+
<h1>Basic multiple lists view</h1>
10+
</div>
1111
<div data-nstest-role="content">
1212
<ul data-nstest-role="listview" data-nstest-inset="true" id="topmost">
1313
<li>Item 1</li>
@@ -27,23 +27,23 @@ <h1>Basic multiple lists view</h1>
2727
<ul data-nstest-role="listview">
2828
<li>Item B-3-0
2929
<ul data-nstest-role="listview">
30-
<li>Item B-3-0-0</li>
31-
<li>Item B-3-0-1
32-
<ul data-nstest-role="listview">
33-
<li>Item B-3-0-1-0</li>
34-
<li>Item B-3-0-1-1</li>
35-
<li>Item B-3-0-1-2</li>
36-
</ul>
37-
</li>
38-
<li>Item B-3-0-2</li>
39-
</ul>
30+
<li>Item B-3-0-0</li>
31+
<li>Item B-3-0-1
32+
<ul data-nstest-role="listview">
33+
<li>Item B-3-0-1-0</li>
34+
<li>Item B-3-0-1-1</li>
35+
<li>Item B-3-0-1-2</li>
36+
</ul>
37+
</li>
38+
<li>Item B-3-0-2</li>
39+
</ul>
4040
</li>
4141
<li>Item B-3-1
42-
<ul data-nstest-role="listview">
43-
<li>Item B-3-1-0</li>
44-
<li>Item B-3-1-1</li>
45-
<li>Item B-3-1-2</li>
46-
</ul>
42+
<ul data-nstest-role="listview">
43+
<li>Item B-3-1-0</li>
44+
<li>Item B-3-1-1</li>
45+
<li>Item B-3-1-2</li>
46+
</ul>
4747
</li>
4848
<li>Item B-3-2</li>
4949
</ul>

‎tests/unit/listview/listview_core.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
setTimeout(function() {
1717
ok($('#basic-linked-test .ui-li').length, ".ui-li classes added to li elements");
1818
start();
19-
}, 500);
19+
}, 800);
2020
});
2121

2222
asyncTest( "Slides to the listview page when the li a is clicked", function() {
@@ -491,7 +491,7 @@
491491

492492
asyncTest( "nested pages are removed from the dom by default", function(){
493493
var findNestedPages = function(){
494-
return $( "#cached-nested-list #topmost" ).listview( 'childPages' );
494+
return $( "#uncached-nested-list #topmost" ).listview( 'childPages' );
495495
};
496496

497497
$.testHelper.pageSequence([
@@ -501,7 +501,7 @@
501501
},
502502

503503
function(){
504-
$.testHelper.openPage( "#cache-tests/nested.html" );
504+
$.testHelper.openPage( "#cache-tests/uncached-nested.html" );
505505
},
506506

507507
function(){
@@ -524,19 +524,18 @@
524524
},
525525

526526
function(){
527-
$.testHelper.openPage( "#cache-tests/nested.html" );
527+
$.testHelper.openPage( "#cache-tests/cached-nested.html" );
528528
},
529529

530530
function(){
531-
same( ("#cached-nested-list").length, 1 );
531+
same( $("#cached-nested-list").length, 1 );
532532
$.testHelper.openPage("#" + location.pathname + "cache-tests/clear.html");
533533
},
534534

535535
function(){
536-
same(findNestedPages().length, 0);
536+
same( $("#cached-nested-list").length, 1 );
537537
start();
538538
}
539539
]);
540540
});
541-
542541
})(jQuery);

0 commit comments

Comments
 (0)