Skip to content

Commit 5d4f7b8

Browse files
uzquianouzquiano
committed
Updates for new pagination defaults (25)
1 parent 50e836e commit 5d4f7b8

25 files changed

+196
-61
lines changed

‎tests/js/testActivities1.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
// NOTE: this = platform
1414

1515
var platformActivityCount = -1;
16-
this.listActivities().count(function(count) {
16+
this.listActivities({
17+
"limit": -1
18+
}).count(function(count) {
1719
platformActivityCount = count;
1820
});
1921

@@ -29,7 +31,9 @@
2931
this.then(function() {
3032

3133
// list platform activities
32-
this.listActivities().count(function(count) {
34+
this.listActivities({
35+
"limit": -1
36+
}).count(function(count) {
3337
ok(count > platformActivityCount, "Platform activity account increased");
3438
platformActivityCount = count;
3539
});
@@ -41,7 +45,9 @@
4145

4246
// list domain activities
4347
var domainActivityCount = -1;
44-
this.listActivities().count(function(count) {
48+
this.listActivities({
49+
"limit": -1
50+
}).count(function(count) {
4551
domainActivityCount = count;
4652
});
4753

@@ -53,7 +59,9 @@
5359
});
5460

5561
// list domain activities
56-
this.listActivities().count(function(count) {
62+
this.listActivities({
63+
"limit": -1
64+
}).count(function(count) {
5765
ok(count > domainActivityCount, "Domain activity count increased");
5866
});
5967
});
@@ -62,7 +70,9 @@
6270
});
6371

6472
// list platform activities
65-
this.listActivities().count(function(count) {
73+
this.listActivities({
74+
"limit": -1
75+
}).count(function(count) {
6676
ok(count > platformActivityCount, "Platform activity account increased (second time)");
6777
success();
6878
});

‎tests/js/testApplication1.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
var key = "key-" + new Date().getTime();
1919

2020
var originalCount = -1;
21-
this.listApplications().count(function(count) {
21+
this.listApplications({
22+
"limit": -1
23+
}).count(function(count) {
2224
originalCount = count;
2325
});
2426

@@ -29,7 +31,9 @@
2931
}).then(function() {
3032
application = this;
3133
});
32-
this.listApplications().count(function(count) {
34+
this.listApplications({
35+
"limit": -1
36+
}).count(function(count) {
3337
equal(count, originalCount + 1, "Application count + 1");
3438
});
3539

@@ -43,7 +47,9 @@
4347

4448
this.readApplication(application.getId()).update().del();
4549

46-
this.listApplications().count(function(count) {
50+
this.listApplications({
51+
"limit": -1
52+
}).count(function(count) {
4753
equal(count, originalCount, "Application back to what it was");
4854
});
4955

‎tests/js/testAuthentication12.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@
164164
var f3 = function(client, ticket, accessToken, refreshToken, grantTime)
165165
{
166166
// try to do something with the platform (here we list registrars)
167-
this.listRegistrars().then(function() {
167+
this.listRegistrars({
168+
"limit": -1
169+
}).then(function() {
168170

169171
Chain(this.getPlatform()).then(function() {
170172

‎tests/js/testAuthentication13.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@
136136
window.setTimeout(function() {
137137

138138
// list registrars
139-
Chain(platform).listRegistrars().then(function() {
139+
Chain(platform).listRegistrars({
140+
"limit": -1
141+
}).then(function() {
140142

141143
var newTicket1 = this.getDriver().getAuthInfo().getTicket();
142144
ok(newTicket1, "Pass1: Acquired a new ticket");
@@ -159,7 +161,9 @@
159161
window.setTimeout(function() {
160162

161163
// list registrars
162-
Chain(platform).listRegistrars().then(function() {
164+
Chain(platform).listRegistrars({
165+
"limit": -1
166+
}).then(function() {
163167

164168
var newTicket2 = this.getDriver().getAuthInfo().getTicket();
165169
ok(newTicket2, "Pass2: Acquired a new ticket");

‎tests/js/testAuthentication3.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626

2727
// NOTE: this = platform
2828

29-
this.listRepositories().then(function() {
29+
this.listRepositories({
30+
"limit": -1
31+
}).then(function() {
3032

3133
ok(true, "First authentication worked");
3234

‎tests/js/testAuthentication5.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030

3131
this.createRepository();
3232

33-
this.listRepositories().count(function(count) {
33+
this.listRepositories({
34+
"limit": -1
35+
}).count(function(count) {
3436

3537
ok(count > 0, "Count was greater than zero");
3638
});
@@ -40,7 +42,9 @@
4042
// cookie should be gone
4143
ok(!Gitana.readCookie("GITANA_TICKET", "Cookie was deleted"));
4244

43-
this.listRepositories().then(function() {
45+
this.listRepositories({
46+
"limit": -1
47+
}).then(function() {
4448
ok(false, "Should not have made it this far");
4549
});
4650
});

‎tests/js/testAuthentication8.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
ok(true, "Successfully authenticated");
2424

2525
// list domains
26-
this.listDomains().then(function() {
26+
this.listDomains({
27+
"limit": -1
28+
}).then(function() {
2729
ok(true, "First list worked");
2830
});
2931

@@ -34,7 +36,9 @@
3436

3537
// list domains again
3638
// this time the refresh token should be automatically used to re-acquire an access token
37-
this.listDomains().then(function() {
39+
this.listDomains({
40+
"limit": -1
41+
}).then(function() {
3842
ok(true, "Second list worked");
3943
});
4044

‎tests/js/testAutoClientMapping1.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343

4444
this.then(function() {
4545

46-
this.listAutoClientMappings().count(function(count) {
46+
this.listAutoClientMappings({
47+
"limit": -1
48+
}).count(function(count) {
4749
equal(count, 3, "Found 3 auto client mappings");
4850
});
4951

@@ -70,7 +72,9 @@
7072
this.readAutoClientMapping(acm3.getId()).update().del();
7173

7274
// list
73-
this.listAutoClientMappings().count(function(count) {
75+
this.listAutoClientMappings({
76+
"limit": -1
77+
}).count(function(count) {
7478
equal(count, 2, "Auto Client Mapping now 2");
7579
});
7680

‎tests/js/testDirectory1.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
});
3838

3939
// then test out deletes
40-
this.listDirectories().then(function() {
40+
this.listDirectories({
41+
"limit": -1
42+
}).then(function() {
4143

4244
var directory2 = this.get(directory.getId());
4345
ok(directory2, "Successfully retrieved from list");

‎tests/js/testDomain1.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
});
3838

3939
// then test out deletes
40-
this.listDomains().then(function() {
40+
this.listDomains({
41+
"limit": -1
42+
}).then(function() {
4143

4244
var domain2 = this.get(domain.getId());
4345
ok(domain2, "Successfully retrieved from list");

‎tests/js/testDomainPrincipal1.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
var count = 0;
2222

2323
// first: list and count all of the users manually
24-
this.listUsers().count(function(c) {
24+
this.listUsers({
25+
"limit": -1
26+
}).count(function(c) {
2527
count = c;
2628
});
2729

@@ -37,7 +39,9 @@
3739
// third: list users again and verify size + 1
3840
// list users
3941
var recount = 0;
40-
this.listUsers().count(function(c) {
42+
this.listUsers({
43+
"limit": -1
44+
}).count(function(c) {
4145
recount = c;
4246
equals(recount, count + 1, "Size incremented by 1");
4347
});

‎tests/js/testDomainPrincipal2.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
// count the number of groups
2222
var count = 0;
23-
this.listGroups().each(function() {
23+
this.listGroups({
24+
"limit": -1
25+
}).each(function() {
2426
count++;
2527
});
2628

@@ -35,7 +37,9 @@
3537

3638
// list groups and verify size + 1
3739
var recount = 0;
38-
this.listGroups().each(function() {
40+
this.listGroups({
41+
"limit": -1
42+
}).each(function() {
3943
recount++;
4044
}).then(function() {
4145
equals(recount, count + 1, "Size incremented by 1");

‎tests/js/testDomainPrincipal3.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@
3232

3333
// count the number of users
3434
var userCount = 0;
35-
this.listUsers().count(function(count) {
35+
this.listUsers({
36+
"limit": -1
37+
}).count(function(count) {
3638
userCount = count;
3739
});
3840

3941
// counter the number of groups
4042
var groupCount = 0;
41-
this.listUsers().count(function(count) {
43+
this.listUsers({
44+
"limit": -1
45+
}).count(function(count) {
4246
groupCount = count;
4347
});
4448

@@ -114,16 +118,24 @@
114118
this.addMember(test.group3, test.user6);
115119

116120
// verify memberships
117-
this.listMembers(test.group1, "user").count(function(count) {
121+
this.listMembers(test.group1, "user", {
122+
"limit": -1
123+
}).count(function(count) {
118124
equal(count, 2, "Group 1 has two users");
119125
});
120-
this.listMembers(test.group2, "group").count(function(count) {
126+
this.listMembers(test.group2, "group", {
127+
"limit": -1
128+
}).count(function(count) {
121129
equal(count, 1, "Group 2 has one child group");
122130
});
123-
this.listMembers(test.group2, "user").count(function(count) {
131+
this.listMembers(test.group2, "user", {
132+
"limit": -1
133+
}).count(function(count) {
124134
equal(count, 1, "Group 2 has one user");
125135
});
126-
this.listMembers(test.group3, "user").count(function(count) {
136+
this.listMembers(test.group3, "user", {
137+
"limit": -1
138+
}).count(function(count) {
127139
equal(count, 3, "Group 3 has three users");
128140
});
129141

‎tests/js/testDomainPrincipal4.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,12 @@
126126

127127
// test sorting of users on query
128128
var index = 0;
129-
this.listUsers({"sort":{"title": 1}}).each(function() {
129+
this.listUsers({
130+
"sort":{
131+
"title": 1
132+
},
133+
"limit": -1
134+
}).each(function() {
130135

131136
if (this.get("tag") == tag)
132137
{

‎tests/js/testNodeDictionary1.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,30 @@
1515
// NOTE: this = branch
1616

1717
// list all definitions
18-
this.listDefinitions().count(function(count) {
18+
this.listDefinitions({
19+
"limit": -1
20+
}).count(function(count) {
1921
ok(count > 0, "Found definitions");
2022
});
2123

2224
// list type definitions
23-
this.listDefinitions("type").count(function(count) {
25+
this.listDefinitions("type", {
26+
"limit": -1
27+
}).count(function(count) {
2428
ok(count > 0, "Found type definitions");
2529
});
2630

2731
// list association type definitions
28-
this.listDefinitions("association").count(function(count) {
32+
this.listDefinitions("association", {
33+
"limit": -1
34+
}).count(function(count) {
2935
ok(count > 0, "Found association type definitions");
3036
});
3137

3238
// list feature definitions
33-
this.listDefinitions("feature").count(function(count) {
39+
this.listDefinitions("feature", {
40+
"limit": -1
41+
}).count(function(count) {
3442
ok(count > 0, "Found feature definitions");
3543
});
3644

0 commit comments

Comments
 (0)