Skip to content
This repository
Browse code

Merge branch 'master' into 19735

  • Loading branch information...
commit 848fe92170002e0c17bedd19895710573ef12b5d 2 parents 99e080e + b4ef3d0
John Rogelstad authored
30  enyo-client/application/source/models/customer.js
@@ -533,7 +533,9 @@ white:true*/
533 533
 
534 534
     recordType: 'XM.CustomerType',
535 535
 
536  
-    documentKey: 'code'
  536
+    documentKey: 'code',
  537
+    
  538
+    enforceUpperKey: false
537 539
 
538 540
   });
539 541
 
@@ -566,21 +568,9 @@ white:true*/
566 568
 
567 569
     recordType: 'XM.ShipCharge',
568 570
 
569  
-    documentKey: 'name'
570  
-
571  
-  });
572  
-
573  
-  /**
574  
-    @class
575  
-
576  
-    @extends XM.Model
577  
-  */
578  
-  XM.ShippingForm = XM.Document.extend({
579  
-    /** @scope */
580  
-
581  
-    recordType: 'XM.ShippingForm',
582  
-
583  
-    documentKey: 'name'
  571
+    documentKey: 'name',
  572
+    
  573
+    enforceUpperKey: false
584 574
 
585 575
   });
586 576
 
@@ -594,7 +584,9 @@ white:true*/
594 584
 
595 585
     recordType: 'XM.ShipVia',
596 586
 
597  
-    documentKey: 'code'
  587
+    documentKey: 'code',
  588
+    
  589
+    enforceUpperKey: false
598 590
 
599 591
   });
600 592
 
@@ -608,7 +600,9 @@ white:true*/
608 600
 
609 601
     recordType: 'XM.ShipZone',
610 602
 
611  
-    documentKey: 'name'
  603
+    documentKey: 'name',
  604
+    
  605
+    enforceUpperKey: false
612 606
 
613 607
   });
614 608
 
4  enyo-client/application/source/models/tax.js
@@ -76,7 +76,9 @@ white:true*/
76 76
 
77 77
     recordType: 'XM.TaxCode',
78 78
     
79  
-    documentKey: 'code'
  79
+    documentKey: 'code',
  80
+    
  81
+    enforceUpperKey: false
80 82
 
81 83
   });
82 84
   
4  enyo-client/application/source/models/terms.js
@@ -16,7 +16,9 @@ white:true*/
16 16
 
17 17
     recordType: 'XM.Terms',
18 18
     
19  
-    documentKey: 'code'
  19
+    documentKey: 'code',
  20
+    
  21
+    enforceUpperKey: false
20 22
 
21 23
   });
22 24
   
2  lib/backbone-x/source/characteristic.js
@@ -16,6 +16,8 @@ white:true*/
16 16
     recordType: 'XM.Characteristic',
17 17
 
18 18
     documentKey: 'name',
  19
+    
  20
+    enforceUpperKey: false,
19 21
 
20 22
     defaults: {
21 23
       characteristicType: 0,
4  node-datasource/test/vows/lib/crud.js
@@ -115,6 +115,10 @@ var _ = require("underscore"),
115 115
           if (typeof (data.model.get(key)) === 'object' && typeof value === 'object') {
116 116
             // if the data is a model and the test hash looks like {contact: {id: 7}}
117 117
             assert.equal(data.model.get(key).id, value.id);
  118
+          } else if (key === data.model.documentKey &&
  119
+              data.model.enforceUpperKey === true) {
  120
+              // this is the document key, so it should have been made upper case
  121
+            assert.equal(data.model.get(key), value.toUpperCase());
118 122
           } else if (typeof (data.model.get(key)) === 'object' && typeof value === 'number') {
119 123
             // if the data is a model and the test hash looks like {contact: 7}
120 124
             assert.equal(data.model.get(key).id, value);
3  node-datasource/test/vows/models/account.js
@@ -15,7 +15,8 @@ var XVOWS = XVOWS || {};
15 15
   var data = {};
16 16
 
17 17
   data.createHash = {
18  
-    number: "test account"
  18
+    number: "test account",
  19
+    name: "A test Account"
19 20
   };
20 21
 
21 22
   data.updateHash = {
0  node-datasource/test/vows/models/item_site.js → node-datasource/test/vows/wip/item_site.js
File renamed without changes
0  node-datasource/test/vows/models/opportunity.js → node-datasource/test/vows/wip/opportunity.js
File renamed without changes

0 notes on commit 848fe92

Please sign in to comment.
Something went wrong with that request. Please try again.