Skip to content

Commit 0bf5ce8

Browse files
author
scottjehl
committed
set unit test pages namespace to "nstest-"
1 parent e46da87 commit 0bf5ce8

File tree

18 files changed

+121
-110
lines changed

18 files changed

+121
-110
lines changed

‎external/qunit.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
left: -10000px;
196196
}
197197

198-
[ data-jq-role='page'], [ data-jq-role='dialog'] {
198+
[ data-nstest-role='page'], [ data-nstest-role='dialog'] {
199199
position: absolute !important;
200200
top: -10000px !important;
201201
}

‎tests/functional/addrbar.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
</style>
2828
</head>
2929
<body>
30-
<div data-jq-role="page" data-jq-theme="b" id="jqm-home">
31-
<div data-jq-role="header">
30+
<div data-role="page" data-theme="b" id="jqm-home">
31+
<div data-role="header">
3232
<h1>Event Logger</h1>
3333
</div>
3434

35-
<div data-jq-role="content">
35+
<div data-role="content">
3636
<p>Touch events on this page will log out below, prepending to the top as they arrive.</p>
3737

38-
<a href="foo.html" data-jq-role="button">Click me</a>
38+
<a href="foo.html" data-role="button">Click me</a>
3939

40-
<ul data-jq-role="listview" id="log">
40+
<ul data-role="listview" id="log">
4141

4242
</ul>
4343

‎tests/functional/eventlogger.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
</script>
2020
</head>
2121
<body>
22-
<div data-jq-role="page" data-jq-theme="b" id="jqm-home">
23-
<div data-jq-role="header">
22+
<div data-role="page" data-theme="b" id="jqm-home">
23+
<div data-role="header">
2424
<h1>Event Logger</h1>
2525
</div>
2626

27-
<div data-jq-role="content">
27+
<div data-role="content">
2828
<p>Touch events on this page will log out below, prepending to the top as they arrive.</p>
2929

30-
<ul data-jq-role="listview" id="log">
30+
<ul data-role="listview" id="log">
3131

3232
</ul>
3333

‎tests/speed/basic-page.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
</head>
3131
<body>
3232

33-
<div data-jq-role="page">
34-
<div data-jq-role="header">
33+
<div data-role="page">
34+
<div data-role="header">
3535
<h1>Basic Page</h1>
3636
</div>
37-
<div data-jq-role="content">
37+
<div data-role="content">
3838
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Vestibulum id ligula porta felis euismod semper. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>
3939

4040
<p>Aenean lacinia bibendum nulla sed consectetur. Sed posuere consectetur est at lobortis. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>

‎tests/speed/lists-ul.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
</head>
1010
<body>
1111

12-
<div data-jq-role="page">
12+
<div data-role="page">
1313

14-
<div data-jq-role="header">
14+
<div data-role="header">
1515
<h1>400 item list</h1>
1616
</div><!-- /header -->
1717

18-
<div data-jq-role="content" data-jq-filter="true">
18+
<div data-role="content" data-filter="true">
1919

20-
<ul data-jq-role="listview" data-jq-theme="d">
20+
<ul data-role="listview" data-theme="d">
2121
<li><a href="index.html">Acura</a></li>
2222
<li><a href="index.html">Audi</a></li>
2323
<li><a href="index.html">BMW</a></li>

‎tests/unit/core/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<title>jQuery Mobile Core Test Suite</title>
66

77
<script type="text/javascript" src="../../../js/jquery.js"></script>
8+
<script src="../jquery.setNameSpace.js"></script>
89
<script type="text/javascript" src="../../../external/qunit.js"></script>
910
<script type="text/javascript" src="../../../js/"></script>
1011
<!-- added explicitly for library reloading (see testHelper ) -->
@@ -24,7 +25,7 @@ <h2 id="qunit-userAgent"></h2>
2425
<ol id="qunit-tests">
2526
</ol>
2627

27-
<div data-jq-role="page">
28+
<div data-nstest-role="page">
2829
</div>
2930

3031
</body>

‎tests/unit/dialog/index.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<title>jQuery Mobile Dialog Test Suite</title>
66

77
<script type="text/javascript" src="../../../js/jquery.js"></script>
8+
<script src="../jquery.setNameSpace.js"></script>
89
<script type="text/javascript" src="../../../js/"></script>
910
<script type="text/javascript" src="../../../tests/jquery.testHelper.js"></script>
1011

@@ -23,12 +24,12 @@ <h2 id="qunit-userAgent"></h2>
2324
<ol id="qunit-tests">
2425
</ol>
2526

26-
<div id="bar" data-jq-role="page">
27-
<a href="#foo-dialog" data-jq-role="button" data-jq-inline="true" data-jq-rel="dialog"></a>
27+
<div id="bar" data-nstest-role="page">
28+
<a href="#foo-dialog" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog"></a>
2829
</div>
2930

30-
<div id="foo-dialog" data-jq-role="dialog">
31-
<div data-jq-role="header" data-jq-theme="d" data-jq-position="inline">
31+
<div id="foo-dialog" data-nstest-role="dialog">
32+
<div data-nstest-role="header" data-nstest-theme="d" data-nstest-position="inline">
3233
<h1>Dialog</h1>
3334
</div>
3435
<a href="#" id="internal-link">foo</a>

‎tests/unit/jquery.setNameSpace.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//set namespace for unit test markp
2+
$( document ).bind( "mobileinit", function(){
3+
$.mobile.ns = "nstest-";
4+
});

‎tests/unit/listview/index.html‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<title>jQuery Mobile Listview Integration Test</title>
66

77
<script type="text/javascript" src="../../../js/jquery.js"></script>
8+
<script src="../jquery.setNameSpace.js"></script>
89
<script type="text/javascript" src="../../../js/"></script>
910
<script type="text/javascript" src="../../jquery.testHelper.js"></script>
1011
<link rel="stylesheet" href="../../../themes/default" />
@@ -22,32 +23,32 @@ <h2 id="qunit-userAgent"></h2>
2223
</ol>
2324

2425
<!-- Basic Linked view test -->
25-
<div data-jq-role="page" id='basic-linked-test'>
26-
<div data-jq-role="header" data-jq-position="inline">
26+
<div data-nstest-role="page" id='basic-linked-test'>
27+
<div data-nstest-role="header" data-nstest-position="inline">
2728
<h1>Basic List View</h1>
2829
</div>
29-
<div data-jq-role="content">
30-
<ul data-jq-role="listview">
30+
<div data-nstest-role="content">
31+
<ul data-nstest-role="listview">
3132
<li><a href="#basic-link-results">Home</a></li>
3233
<li><a href="#basic-link-results">Back</a></li>
3334
<li><a href="#basic-link-results">Return</a></li>
3435
</ul>
3536
</div>
3637
</div>
3738

38-
<div data-jq-role='page' id='basic-link-results'>
39-
<div data-jq-role="header" data-jq-position="inline">
39+
<div data-nstest-role='page' id='basic-link-results'>
40+
<div data-nstest-role="header" data-nstest-position="inline">
4041
<h1>Results</h1>
4142
</div>
4243
</div>
4344

4445
<!-- Nested List -->
45-
<div data-jq-role="page" id='nested-list-test'>
46-
<div data-jq-role="header" data-jq-position="inline">
46+
<div data-nstest-role="page" id='nested-list-test'>
47+
<div data-nstest-role="header" data-nstest-position="inline">
4748
<h1>Basic List View</h1>
4849
</div>
49-
<div data-jq-role="content">
50-
<ul data-jq-role="listview">
50+
<div data-nstest-role="content">
51+
<ul data-nstest-role="listview">
5152
<li>Groups of animals
5253
<ul>
5354
<li>pod of whales</li>
@@ -70,32 +71,32 @@ <h1>Basic List View</h1>
7071
</div>
7172

7273
<!-- Numbered List -->
73-
<div data-jq-role="page" id='numbered-list-test'>
74-
<div data-jq-role="header" data-jq-position="inline">
74+
<div data-nstest-role="page" id='numbered-list-test'>
75+
<div data-nstest-role="header" data-nstest-position="inline">
7576
<h1>Basic List View</h1>
7677
</div>
77-
<div data-jq-role="content">
78-
<ol data-jq-role="listview">
78+
<div data-nstest-role="content">
79+
<ol data-nstest-role="listview">
7980
<li><a href="#numbered-list-results">Number 1</a></li>
8081
<li><a href="#numbered-list-results">Number 2</a></li>
8182
<li><a href="#numbered-list-results">Number 3</a></li>
8283
</ol>
8384
</div>
8485
</div>
8586

86-
<div data-jq-role='page' id='numbered-list-results'>
87-
<div data-jq-role="header" data-jq-position="inline">
87+
<div data-nstest-role='page' id='numbered-list-results'>
88+
<div data-nstest-role="header" data-nstest-position="inline">
8889
<h1>Numbered List</h1>
8990
</div>
9091
</div>
9192

9293
<!-- Read only List -->
93-
<div data-jq-role="page" id='read-only-list-test'>
94-
<div data-jq-role="header" data-jq-position="inline">
94+
<div data-nstest-role="page" id='read-only-list-test'>
95+
<div data-nstest-role="header" data-nstest-position="inline">
9596
<h1>Basic List View</h1>
9697
</div>
97-
<div data-jq-role="content">
98-
<ul data-jq-role="listview">
98+
<div data-nstest-role="content">
99+
<ul data-nstest-role="listview">
99100
<li>Read</li>
100101
<li>Only</li>
101102
<li>List</li>
@@ -105,12 +106,12 @@ <h1>Basic List View</h1>
105106
</div>
106107

107108
<!-- Split listview -->
108-
<div data-jq-role="page" id='split-list-test'>
109-
<div data-jq-role="header" data-jq-position="inline">
109+
<div data-nstest-role="page" id='split-list-test'>
110+
<div data-nstest-role="header" data-nstest-position="inline">
110111
<h1>Split List View</h1>
111112
</div>
112-
<div data-jq-role="content">
113-
<ul data-jq-role="listview">
113+
<div data-nstest-role="content">
114+
<ul data-nstest-role="listview">
114115
<li>
115116
<a href="#split-list-link1">link one</a>
116117
<a href="#split-list-link2">link second</a>
@@ -127,42 +128,42 @@ <h1>Split List View</h1>
127128
</div>
128129
</div>
129130

130-
<div data-jq-role="page" id='split-list-link1'>
131-
<div data-jq-role="header" data-jq-position="inline">
131+
<div data-nstest-role="page" id='split-list-link1'>
132+
<div data-nstest-role="header" data-nstest-position="inline">
132133
<h1>Split List view 1</h1>
133134
</div>
134135
</div>
135136

136-
<div data-jq-role="page" id='split-list-link2'>
137-
<div data-jq-role="header" data-jq-position="inline">
137+
<div data-nstest-role="page" id='split-list-link2'>
138+
<div data-nstest-role="header" data-nstest-position="inline">
138139
<h1>Split List view 2</h1>
139140
</div>
140141
</div>
141142

142143
<!-- List divider -->
143-
<div data-jq-role="page" id='list-divider-test'>
144-
<div data-jq-role="header" data-jq-position="inline">
144+
<div data-nstest-role="page" id='list-divider-test'>
145+
<div data-nstest-role="header" data-nstest-position="inline">
145146
<h1>List Divider Test</h1>
146147
</div>
147-
<div data-jq-role="content">
148-
<ul data-jq-role="listview">
148+
<div data-nstest-role="content">
149+
<ul data-nstest-role="listview">
149150
<li>a is for aquaman</li>
150151
<li>b is for batman</li>
151-
<li data-jq-role="list-divider">This is a list divider</li>
152+
<li data-nstest-role="list-divider">This is a list divider</li>
152153
<li>c is for catwoman</li>
153-
<li data-jq-role="list-divider">This is another list divider</li>
154+
<li data-nstest-role="list-divider">This is another list divider</li>
154155
<li>d is for darkwing</li>
155156
</ul>
156157
</div>
157158
</div>
158159

159160
<!-- Search bar filter -->
160-
<div data-jq-role="page" id='search-filter-test'>
161-
<div data-jq-role="header" data-jq-position="inline">
161+
<div data-nstest-role="page" id='search-filter-test'>
162+
<div data-nstest-role="header" data-nstest-position="inline">
162163
<h1>Split List View</h1>
163164
</div>
164-
<div data-jq-role="content">
165-
<ul data-jq-role="listview" data-jq-filter="true">
165+
<div data-nstest-role="content">
166+
<ul data-nstest-role="listview" data-nstest-filter="true">
166167
<li>a is for aquaman</li>
167168
<li>b is for batman</li>
168169
<li>c is for catwoman</li>

‎tests/unit/navigation/data-url-tests/data-url.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
</head>
55
<body>
6-
<div data-jq-role="page" data-jq-url="foo/" data-other="for testing">
6+
<div data-nstest-role="page" data-nstest-url="foo/" data-other="for testing">
77
</div>
88
</body>
99
</html>

0 commit comments

Comments
 (0)