16
16
use strict;
17
17
use Test::More;
18
18
use Test::Deep;
19
+ use Data::Dumper;
19
20
use Exception::Class;
20
21
21
22
use WebGUI::Test; # Must use this before any other WebGUI modules
@@ -194,9 +195,6 @@ is($profile_address->getId,$address1->getId,"getProfileAddress returns addresses
194
195
#
195
196
# ######################################################################
196
197
197
- # Clear the book address cache
198
- $book -> uncache;
199
-
200
198
my $address_info = {
201
199
label => ' Profile Label' ,
202
200
addressId => $address1 -> getId,
@@ -232,14 +230,11 @@ cmp_bag(
232
230
my $u = WebGUI::User-> new($session ,$book -> get(" userId" ));
233
231
234
232
cmp_bag(
235
- [ map { $u -> profileField ($_ ) } keys %{ $book -> getProfileAddressMappings } ],
233
+ [ map { $u -> get ($_ ) } keys %{ $book -> getProfileAddressMappings } ],
236
234
[ map { $address1 -> get($_ ) } values %{ $book -> getProfileAddressMappings } ],
237
235
' Profile address was updated and matches address fields'
238
236
);
239
237
240
- # Test that updates to non profile address does not update the profile
241
- $book -> uncache;
242
-
243
238
$address_info = {
244
239
label => ' Non Profile Label' ,
245
240
addressId => $address2 -> getId,
@@ -275,7 +270,7 @@ cmp_bag(
275
270
);
276
271
277
272
cmp_bag(
278
- [ map { $u -> profileField ($_ ) } keys %{ $book -> getProfileAddressMappings } ],
273
+ [ map { $u -> get ($_ ) } keys %{ $book -> getProfileAddressMappings } ],
279
274
[ map { $address1 -> get($_ ) } values %{ $book -> getProfileAddressMappings } ],
280
275
' Profile address was not updated when non profile fields were saved'
281
276
);
@@ -286,9 +281,6 @@ cmp_bag(
286
281
#
287
282
# ######################################################################
288
283
289
- # clear the cache
290
- $book -> uncache;
291
-
292
284
$session -> request-> setup_body({
293
285
' addressId' => $address2 -> getId,
294
286
' callback' => q| {'url':''}|
@@ -304,9 +296,6 @@ cmp_bag(
304
296
);
305
297
306
298
307
- # clear the cache
308
- $book -> uncache;
309
-
310
299
$session -> request-> setup_body({
311
300
' addressId' => $address1 -> getId,
312
301
' callback' => q| {'url':''}|
@@ -328,9 +317,6 @@ cmp_bag(
328
317
#
329
318
# ######################################################################
330
319
331
- # clear the cache
332
- $book -> uncache;
333
-
334
320
my $addressBookId = $alreadyHaveBook -> getId;
335
321
my $firstCount = $session -> db-> quickScalar(' select count(*) from addressBook where addressBookId=?' ,[$addressBookId ]);
336
322
$alreadyHaveBook -> delete ();
@@ -381,6 +367,7 @@ cmp_bag(
381
367
# Create some data to search for
382
368
my $andySession = WebGUI::Test-> newSession;
383
369
my $andy = WebGUI::User-> create($andySession );
370
+ $andy -> username(' andy' );
384
371
WebGUI::Test-> addToCleanup($andy );
385
372
$andySession -> user({ userId => $andy -> getId });
386
373
my $andyBook = WebGUI::Shop::AddressBook-> create($andySession );
@@ -421,6 +408,7 @@ my $andyAddr2 = $andyBook->addAddress({
421
408
422
409
my $redSession = WebGUI::Test-> newSession;
423
410
my $red = WebGUI::User-> create($redSession );
411
+ $red -> username(' red' );
424
412
WebGUI::Test-> addToCleanup($red );
425
413
$redSession -> user({userId => $red -> getId});
426
414
my $redBook = WebGUI::Shop::AddressBook-> create($redSession );
@@ -439,12 +427,14 @@ my $redAddr = $redBook->addAddress({
439
427
country => ' US' ,
440
428
phoneNumber => ' 111-111-1111' ,
441
429
email => ' red@shawshank.com' ,
442
- organization => ' Shawshank'
430
+ organization => ' Shawshank' ,
431
+ isProfile => 0,
443
432
});
444
433
445
434
446
435
my $brooksSession = WebGUI::Test-> newSession;
447
436
my $brooks = WebGUI::User-> create($brooksSession );
437
+ $brooks -> username(' brooks' );
448
438
WebGUI::Test-> addToCleanup($brooks );
449
439
$brooksSession -> user({userId => $brooks -> getId});
450
440
my $brooksBook = WebGUI::Shop::AddressBook-> create($brooksSession );
@@ -463,7 +453,8 @@ my $brooksAddr = $brooksBook->addAddress({
463
453
country => ' US' ,
464
454
phoneNumber => ' 111-111-1111' ,
465
455
email => ' brooks@shawshank.com' ,
466
- organization => ' Shawshank'
456
+ organization => ' Shawshank' ,
457
+ isProfile => 0,
467
458
});
468
459
469
460
# Test search as admin
@@ -473,11 +464,20 @@ $session->request->setup_body({
473
464
474
465
my $results = JSON-> new-> decode($book -> www_ajaxSearch);
475
466
467
+ my $andyAddr1_get = $andyAddr1 -> get;
468
+ my $andyAddr2_get = $andyAddr2 -> get;
469
+ my $redAddr_get = $redAddr -> get;
470
+ my $brooksAddr_get = $brooksAddr -> get;
471
+
472
+ foreach my $addr ($andyAddr1_get , $andyAddr2_get , $redAddr_get , $brooksAddr_get ) {
473
+ delete $addr -> {addressBook };
474
+ }
475
+
476
476
cmp_bag(
477
477
$results ,
478
478
[
479
- { %{$andyAddr1 -> get }, username => $andy -> username },
480
- { %{$andyAddr2 -> get }, username => $andy -> username },
479
+ { %{$andyAddr1_get }, username => $andy -> username, },
480
+ { %{$andyAddr2_get }, username => $andy -> username, },
481
481
],
482
482
' Ajax Address Search matches name correctly for admins'
483
483
);
@@ -501,7 +501,7 @@ $results = JSON->new->decode($book->www_ajaxSearch);
501
501
502
502
cmp_bag(
503
503
$results ,
504
- [{ %{$andyAddr1 -> get }, username => $andy -> username }],
504
+ [{ %{$andyAddr1_get }, username => $andy -> username }],
505
505
' Ajax Address Search matches multiple fields correctly'
506
506
);
507
507
@@ -539,9 +539,9 @@ $results = JSON->new->decode($book->www_ajaxSearch);
539
539
cmp_bag(
540
540
$results ,
541
541
[
542
- { %{$andyAddr1 -> get}, username => $andy -> username },
543
- { %{$redAddr -> get}, username => $red -> username },
544
- { %{$brooksAddr -> get }, username => $brooks -> username },
542
+ { %{$andyAddr1_get }, username => $andy -> username },
543
+ { %{$redAddr_get }, username => $red -> username },
544
+ { %{$brooksAddr_get }, username => $brooks -> username },
545
545
],
546
546
' Ajax Address Search returns cross user results for admins'
547
547
);
@@ -556,9 +556,9 @@ $results = JSON->new->decode($andyBook->www_ajaxSearch);
556
556
cmp_bag(
557
557
$results ,
558
558
[
559
- { %{$andyAddr1 -> get }, username => $andy -> username },
560
- { %{$redAddr -> get }, username => $red -> username },
561
- { %{$brooksAddr -> get }, username => $brooks -> username },
559
+ { %{$andyAddr1_get }, username => $andy -> username },
560
+ { %{$redAddr_get }, username => $red -> username },
561
+ { %{$brooksAddr_get }, username => $brooks -> username },
562
562
],
563
563
' Ajax Address Search returns cross user results for shop admins'
564
564
);
@@ -573,9 +573,9 @@ $results = JSON->new->decode($redBook->www_ajaxSearch);
573
573
cmp_bag(
574
574
$results ,
575
575
[
576
- { %{$andyAddr1 -> get }, username => $andy -> username },
577
- { %{$redAddr -> get }, username => $red -> username },
578
- { %{$brooksAddr -> get }, username => $brooks -> username },
576
+ { %{$andyAddr1_get }, username => $andy -> username },
577
+ { %{$redAddr_get }, username => $red -> username },
578
+ { %{$brooksAddr_get }, username => $brooks -> username },
579
579
],
580
580
' Ajax Address Search returns cross user results for shop cashiers'
581
581
);
@@ -588,7 +588,7 @@ $results = JSON->new->decode($brooksBook->www_ajaxSearch);
588
588
589
589
cmp_bag(
590
590
$results ,
591
- [{ %{$brooksAddr -> get }, username => $brooks -> username }],
591
+ [{ %{$brooksAddr_get }, username => $brooks -> username }],
592
592
' Ajax Address Search returns only current user results for non privileged users'
593
593
);
594
594
0 commit comments