Skip to content

Commit 15fcca2

Browse files
abhinav-from-contentstackabhinav-from-contentstack
committed
fix: added fixes for failing asset tests
1 parent dc81713 commit 15fcca2

File tree

3 files changed

+55
-45
lines changed

3 files changed

+55
-45
lines changed

‎test/asset/find-result-wrapper.js‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ test('Initalise the Contentstack Stack Instance', function(TC) {
2222

2323
test('default .find() no fallback', function(assert) {
2424
var _in = ['ja-jp']
25-
Stack.Assets().Query().language('ja-jp').find()
25+
Stack.Assets().Query().language('ja-jp').toJSON().find()
2626
.then((assets) => {
2727
assert.ok(assets[0].length, 'Assets present in the resultset');
2828
assert.notok(assets[1], 'Count should not be present');
2929
if (assets && assets.length && assets[0].length) {
3030
var _assets = assets[0].every(function(asset) {
31-
return (_in.indexOf(asset.toJSON()['publish_details']['locale']) != -1);
31+
return (_in.indexOf(asset['publish_details']['locale']) != -1);
3232
});
3333
assert.equal(_assets, true, "Publish content fallback");
3434
}
@@ -40,13 +40,13 @@ test('default .find() no fallback', function(assert) {
4040
})
4141
test('default .find() fallback', function(assert) {
4242
var _in = ['ja-jp', 'en-us']
43-
Stack.Assets().Query().language('ja-jp').includeFallback().find()
43+
Stack.Assets().Query().language('ja-jp').includeFallback().toJSON().find()
4444
.then((assets) => {
4545
assert.ok(assets[0].length, 'Assets present in the resultset');
4646
assert.notok(assets[1], 'Count should not be present');
4747
if (assets && assets.length && assets[0].length) {
4848
var _assets = assets[0].every(function(asset) {
49-
return (_in.indexOf(asset.toJSON()['publish_details']['locale']) != -1);
49+
return (_in.indexOf(asset['publish_details']['locale']) != -1);
5050
});
5151
assert.equal(_assets, true, "Publish content fallback");
5252
}
@@ -60,14 +60,14 @@ test('default .find()', function(assert) {
6060
var Query = Stack.Assets().Query(),
6161
field = 'updated_at';
6262
Query
63+
.toJSON()
6364
.find()
6465
.then(function success(assets) {
6566
assert.ok(assets[0].length, 'assets present in the resultset');
6667
assert.ok(!assets[1], 'Count should not present in the result');
6768
if (assets && assets.length && assets[0].length) {
68-
var prev = assets[0][0].get(field);
69+
var prev = assets[0][0][field];
6970
var _assets = assets[0].every(function(asset) {
70-
asset = asset.toJSON();
7171
prev = asset[field];
7272
return (asset.updated_at <= prev);
7373
});
@@ -90,13 +90,13 @@ test('.ascending()', function(assert) {
9090

9191
Query
9292
.ascending(field)
93+
.toJSON()
9394
.find()
9495
.then(function success(assets) {
9596
assert.ok(assets[0].length, 'assets present in the resultset');
9697
if (assets && assets.length && assets[0].length) {
97-
var prev = assets[0][0].get(field);
98+
var prev = assets[0][0][field];
9899
var _assets = assets[0].every(function(asset) {
99-
asset = asset.toJSON();
100100
prev = asset[field];
101101
return (asset[field] >= prev);
102102
});
@@ -116,13 +116,13 @@ test('.descending()', function(assert) {
116116

117117
Query
118118
.descending(field)
119+
.toJSON()
119120
.find()
120121
.then(function success(assets) {
121122
assert.ok(assets[0].length, 'assets present in the resultset');
122123
if (assets && assets.length && assets[0].length) {
123-
var prev = assets[0][0].get(field);
124+
var prev = assets[0][0][field];
124125
var _assets = assets[0].every(function(asset) {
125-
asset = asset.toJSON();
126126
prev = asset[field];
127127
return (asset[field] >= prev);
128128
});
@@ -147,16 +147,16 @@ test('.lessThan()', function(assert) {
147147
Query
148148
.lessThan('file_size', value)
149149
.language('en-us')
150+
.toJSON()
150151
.find()
151152
.then(function success(assets) {
152153
// assert.ok("assets" in result, 'assets key present in the resultset');
153154
assert.ok(assets[0].length, 'assets present in the resultset');
154155
assert.equal(assets[0].length, 1, 'one asset present in the resultset')
155156
if (assets && assets.length && assets[0].length) {
156-
var prev = assets[0][0].get(field);
157+
var prev = assets[0][0][field];
157158
var _assets = true;
158159
_assets = assets[0].slice(1).every(function(asset) {
159-
asset = asset.toJSON();
160160
var flag = (asset[field] < value);
161161
prev = asset[field];
162162
return flag;
@@ -178,14 +178,14 @@ test('.lessThanOrEqualTo()', function(assert) {
178178
Query
179179
.language('en-us')
180180
.lessThanOrEqualTo('file_size', value)
181+
.toJSON()
181182
.find()
182183
.then(function success(assets) {
183184
assert.ok(assets[0].length, 'assets present in the resultset');
184185
assert.equal(assets[0].length, 2, 'two assets present in the resultset');
185186
if (assets && assets.length && assets[0].length) {
186-
var prev = assets[0][0].get(field);
187+
var prev = assets[0][0][field];
187188
var _assets = assets[0].every(function(asset) {
188-
asset = asset.toJSON();
189189
var flag = (asset[field] <= prev);
190190
prev = asset[field];
191191
return flag;
@@ -208,14 +208,14 @@ test('.greaterThan()', function(assert) {
208208
Query
209209
.greaterThan('file_size', value)
210210
.ascending(field)
211+
.toJSON()
211212
.find()
212213
.then(function success(assets) {
213214
assert.ok(assets[0].length, 'assets present in the resultset');
214215
assert.equal(assets[0].length, 3, 'three assets present in the resultset');
215216
if (assets && assets.length && assets[0].length) {
216-
var prev = assets[0][0].get(field);
217+
var prev = assets[0][0][field];
217218
var _assets = assets[0].slice(1).every(function(asset) {
218-
asset = asset.toJSON();
219219
var flag = (asset[field] > value);
220220
prev = asset[field];
221221
return flag;
@@ -238,14 +238,14 @@ test('.greaterThanOrEqualTo()', function(assert) {
238238
Query
239239
.greaterThanOrEqualTo('file_size', value)
240240
.descending(field)
241+
.toJSON()
241242
.find()
242243
.then(function success(assets) {
243244
assert.ok(assets[0].length, 'assets present in the resultset');
244245
assert.equal(assets[0].length, 4, 'four assets present in the resultset');
245246
if (assets && assets.length && assets[0].length) {
246-
var prev = assets[0][0].get(field);
247+
var prev = assets[0][0][field];
247248
var _assets = assets[0].every(function(asset) {
248-
asset = asset.toJSON();
249249
var flag = (asset[field] >= value);
250250
prev = asset[field];
251251
return flag;
@@ -269,14 +269,14 @@ test('.notEqualTo()', function(assert) {
269269
.language('en-us')
270270
.notEqualTo('file_size', value)
271271
.descending(field)
272+
.toJSON()
272273
.find()
273274
.then(function success(assets) {
274275
assert.ok(assets[0].length, 'assets present in the resultset');
275276
assert.equal(assets[0].length, 4, 'four assets present in the resultset');
276277
if (assets && assets.length && assets[0].length) {
277-
var prev = assets[0][0].get(field);
278+
var prev = assets[0][0][field];
278279
var _assets = assets[0].every(function(asset) {
279-
asset = asset.toJSON();
280280
var flag = (asset[field] != value);
281281
prev = asset[field];
282282
return flag;
@@ -302,13 +302,14 @@ test('.containedIn()', function(assert) {
302302

303303
Query
304304
.containedIn('title', _in)
305+
.toJSON()
305306
.find()
306307
.then(function success(assets) {
307308
assert.ok(assets[0].length, 'assets present in the resultset');
308309
assert.equal(assets[0].length, 2, 'two assets present in the resultset');
309310
if (assets && assets.length && assets[0].length) {
310311
var _assets = assets[0].every(function(asset) {
311-
return (_in.indexOf(asset.get('title')) != -1);
312+
return (_in.indexOf(asset['title']) != -1);
312313
});
313314
assert.equal(_assets, true, "assets sorted descending on '" + field + "' field");
314315
}
@@ -326,6 +327,7 @@ test('.notContainedIn()', function(assert) {
326327

327328
Query
328329
.notContainedIn('title', _in)
330+
.toJSON()
329331
.find()
330332
.then(function success(assets) {
331333
assert.ok(assets[0].length, 'No asset present in the resultset');
@@ -350,15 +352,16 @@ test('.exists()', function(assert) {
350352
Query
351353
.language('en-us')
352354
.exists(queryField)
355+
.toJSON()
353356
.find()
354357
.then(function success(assets) {
355358
assert.ok(assets[0].length, 'assets should not be present in the resultset');
356359
assert.equal(assets[0].length, 5, 'five assets present in the resultset');
357360
if (assets && assets.length && assets[0].length) {
358-
var prev = assets[0][0].get(field);
361+
var prev = assets[0][0][field];
359362
var _assets = assets[0].every(function(asset) {
360-
var flag = (asset.get(field) <= prev);
361-
prev = asset.get(field);
363+
var flag = (asset[field] <= prev);
364+
prev = asset[field];
362365
return flag;
363366
});
364367
assert.equal(_assets, true, "assets sorted descending on '" + field + "' field");
@@ -378,13 +381,14 @@ test('.notExists()', function(assert) {
378381

379382
Query
380383
.notExists(queryField)
384+
.toJSON()
381385
.find()
382386
.then(function success(assets) {
383387
assert.notok(assets[0].length, 'No asset present in the resultset');
384388
if (assets && assets.length && assets[0].length) {
385-
var prev = assets[0][0].get(field);
389+
var prev = assets[0][0][field];
386390
var _assets = assets[0].every(function(asset) {
387-
return (asset.get(field) <= prev);
391+
return (asset[field] <= prev);
388392
});
389393
assert.equal(_assets, true, "assets sorted descending on '" + field + "' field");
390394
}
@@ -419,7 +423,6 @@ test('.skip()', function(assert) {
419423
assert.deepEqual(allassets[0].slice(1), assets[0], 'All elements matched.');
420424
if (assets && assets.length && assets[0].length) {
421425
allassets[0] = allassets[0].slice(1);
422-
//var prev = assets[0][0].get(field);
423426
var prev = assets[0][0][field];
424427
var _assets = assets[0].every(function(asset) {
425428
var flag = (asset[field] <= prev);
@@ -487,6 +490,7 @@ test('.count()', function(assert) {
487490

488491
Query
489492
.count()
493+
.toJSON()
490494
.find()
491495
.then(function success(assets) {
492496
assert.ok(assets[0], 'assets count present in the resultset');
@@ -508,6 +512,7 @@ test('.or() - Query Objects', function(assert) {
508512

509513
Query
510514
.or(Query1, Query2)
515+
.toJSON()
511516
.find()
512517
.then(function success(assets) {
513518
assert.ok(assets[0].length, 'assets present in the resultset');
@@ -532,12 +537,12 @@ test('.and() - Query Objects', function(assert) {
532537

533538
Query
534539
.and(Query1, Query2)
540+
.toJSON()
535541
.find()
536542
.then(function success(assets) {
537543
assert.notok(assets[0].length, 'asset not present in the resultset');
538544
if (assets && assets.length && assets[0].length) {
539545
var _assets = assets[0].every(function(asset) {
540-
asset = asset.toJSON();
541546
return (~(asset.title === 'image1' && asset.is_dir === true));
542547
});
543548
assert.ok(_assets, '$AND condition satisfied');
@@ -557,12 +562,12 @@ test('.and() - Raw queries', function(assert) {
557562

558563
Query
559564
.and(Query1, Query2)
565+
.toJSON()
560566
.find()
561567
.then(function success(assets) {
562568
assert.notok(assets[0].length, 'asset not present in the resultset');
563569
if (assets && assets.length && assets[0].length) {
564570
var _assets = assets[0].every(function(asset) {
565-
asset = asset.toJSON();
566571
return ((asset.title === 'image1' && asset.is_dir === true));
567572
});
568573
assert.ok(_assets, '$AND condition satisfied');
@@ -582,13 +587,13 @@ test('.query() - Raw query', function(assert) {
582587

583588
Query
584589
.query({ "$or": [{ "title": "image1" }, { "is_dir": "true" }] })
590+
.toJSON()
585591
.find()
586592
.then(function success(assets) {
587593
assert.ok(assets[0].length, 'assets present in the resultset');
588594
assert.equal(assets[0].length, 1, 'one asset present in resultset');
589595
if (assets && assets.length && assets[0].length) {
590596
var _assets = assets[0].every(function(asset) {
591-
asset = asset.toJSON();
592597
return (asset.title === 'image1' || asset.is_dir === true)
593598
});
594599
assert.ok(_assets, '$OR condition satisfied');
@@ -607,6 +612,7 @@ test('Non reference .tags() ', function(assert) {
607612

608613
Query
609614
.tags(tags)
615+
.toJSON()
610616
.find()
611617
.then(function success(assets) {
612618
assert.ok((assets.length >= 1), '1 or more asset/assets present in the resultset');
@@ -629,12 +635,13 @@ test('.tags()', function(assert) {
629635

630636
Query
631637
.tags(tags)
638+
.toJSON()
632639
.find()
633640
.then(function success(assets) {
634641
assert.ok((assets.length >= 1), '1 or more asset/assets present in the resultset');
635642
if (assets && assets.length && assets[0].length) {
636643
var _assets = assets[0].every(function(asset) {
637-
return (Utils.arrayPresentInArray(tags, asset.get(field)));
644+
return (Utils.arrayPresentInArray(tags, asset[field]));
638645
});
639646
assert.equal(_assets, true, 'Tags specified are found in result set');
640647
}
@@ -653,6 +660,7 @@ test('.search()', function(assert) {
653660

654661
Query
655662
.search('image1')
663+
.toJSON()
656664
.find()
657665
.then(function success(assets) {
658666
assert.ok(assets[0].length, '1 or more asset present in the resultset');
@@ -678,12 +686,13 @@ test('.regex()', function(assert) {
678686
Query
679687
.language('en-us')
680688
.regex(field, regex.pattern, regex.options)
689+
.toJSON()
681690
.find()
682691
.then(function success(assets) {
683692
assert.ok((assets.length >= 1), '1 or more asset/assets present in the resultset');
684693
assert.equal(assets[0].length, 5, '5 assets present in resultset');
685694
var flag = assets[0].every(function(asset) {
686-
return regexpObj.test(asset.get(field));
695+
return regexpObj.test(asset[field]);
687696
});
688697
assert.ok(flag, "regexp satisfied for all the assets in the resultset");
689698
assert.end();
@@ -722,10 +731,10 @@ test('.only() - Single String Parameter', function(assert) {
722731

723732
Query
724733
.only('title')
734+
.toJSON()
725735
.find()
726736
.then(function success(assets) {
727737
var flag = assets[0].every(function(asset) {
728-
asset = asset.toJSON();
729738
return (asset && Object.keys(asset).length === 5 && "title" in asset && "uid" in asset && 'url' in asset);
730739
});
731740
assert.ok(flag, 'assets with the field title in the resultset');
@@ -742,10 +751,10 @@ test('.only() - Multiple String Parameter', function(assert) {
742751

743752
Query
744753
.only('BASE', 'title')
754+
.toJSON()
745755
.find()
746756
.then(function success(assets) {
747757
var flag = assets[0].every(function(asset) {
748-
asset = asset.toJSON();
749758
return (asset && Object.keys(asset).length === 5 && "title" in asset && "uid" in asset && 'url' in asset);
750759
});
751760
assert.ok(flag, 'assets with the field title in the resultset');
@@ -762,10 +771,10 @@ test('.only() - Array Parameter', function(assert) {
762771

763772
Query
764773
.only(['title', 'filename'])
774+
.toJSON()
765775
.find()
766776
.then(function success(assets) {
767777
var flag = assets[0].every(function(asset) {
768-
asset = asset.toJSON();
769778
return (asset && Object.keys(asset).length === 5 && "title" in asset && "filename" in asset && "uid" in asset && 'url' in asset);
770779
});
771780
assert.ok(flag, 'assets with the field title,url in the resultset');

0 commit comments

Comments
 (0)