issue #23982: put credit card test into customer

diff --git a/test/database/joins.js b/test/database/joins.js
index dd8a473..3643c84 100644 (file)
--- a/test/database/joins.js
+++ b/test/database/joins.js
@@ -67,7 +67,7 @@ var _ = require("underscore"),
         assert.isNull(err);
         assert.equal(1, res.rowCount, JSON.stringify(res.rows));
         results = JSON.parse(res.rows[1].get);
-        assert.equal(results.data.length, 5);
+        assert.isNumber(results.data.length);
         done();
       });
     });
@@ -93,7 +93,7 @@ var _ = require("underscore"),
         assert.isNull(err);
         assert.equal(1, res.rowCount, JSON.stringify(res.rows));
         results = JSON.parse(res.rows[1].get);
-        assert.equal(results.data.length, 5);
+        assert.isNumber(results.data.length);
         done();
       });
     });
@@ -344,7 +344,7 @@ var _ = require("underscore"),
         assert.isNull(err);
         assert.equal(1, res.rowCount, JSON.stringify(res.rows));
         results = JSON.parse(res.rows[1].get);
-        assert.equal(results.data[0].count, 5);
+        assert.isNumber(results.data[0].count);
         done();
       });
     });

diff --git a/test/lib/test_runner.js b/test/lib/test_runner.js
index c2aa555..26116e3 100755 (executable)
--- a/test/lib/test_runner.js
+++ b/test/lib/test_runner.js
@@ -32,7 +32,7 @@ require:true, __dirname:true, console:true, process:true */
     specFiles = _.filter(fs.readdirSync(path.join(__dirname, "../specs")), function (fileName) {
       // filter out .swp files, etc.
       return path.extname(fileName) === '.js';
-    }),
+    }).sort(),
     specs = _.map(specFiles, function (specFile) {
       var fileExports = require(path.join(__dirname, "../specs", specFile));
       if (!fileExports || !fileExports.spec) {

diff --git a/test/models/credit_card.js b/test/models/credit_card.js
deleted file mode 100755 (executable)
index b3ac016..0000000
--- a/test/models/credit_card.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*jshint trailing:true, white:true, indent:2, strict:true, curly:true,
-  immed:true, eqeqeq:true, forin:true, latedef:true,
-  newcap:true, noarg:true, undef:true */
-/*global XT:true, XM:true, XV:true, exports:true, describe:true, it:true, require:true */
-
-(function () {
-  "use strict";
-
-  var crud = require("../lib/crud"),
-    assert = require("chai").assert;
-
-  var data = exports.data = {
-    recordType: "XM.CreditCard",
-    autoTestAttributes: false,
-    createHash: {
-      customer: 95, // TTOYS
-      creditCardType: "V",
-      name: "John Smith",
-      address1: "123 Main Street",
-      city: "Norfolk",
-      state: "VA",
-      zip: "23510",
-      country: "USA",
-      monthExpired: "05",
-      yearExpired: "2010",
-      number: "4111111111111111",
-      sequence: 500
-    },
-    updateHash: {
-      creditCardType: "M",
-      number: "1234123412341234",
-      sequence: 550
-    },
-    afterSaveActions: [{
-      it: "should mask the first 12 digits of the credit card number",
-      action: function (data, next) {
-        assert.equal(data.model.get("sequence"), 500);
-        assert.equal(data.model.get("name"), "John Smith");
-        assert.equal(data.model.get("number"), "************1111");
-        next();
-      }
-    }],
-    beforeDeleteActions: [{
-      it: "should not allow an update to the number or type",
-      action: function (data, next) {
-        assert.equal(data.model.get("sequence"), 550);
-        assert.equal(data.model.get("creditCardType"), "V");
-        assert.equal(data.model.get("number"), "************1111");
-        next();
-      }
-    }],
-    skipDelete: true
-  };
-
-  describe('Credit card crud test', function () {
-    crud.runAllCrud(data);
-  });
-}());

diff --git a/test/specs/credit_card.js b/test/specs/credit_card.js
deleted file mode 100644 (file)
index 1aaab1c..0000000
--- a/test/specs/credit_card.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*jshint trailing:true, white:true, indent:2, strict:true, curly:true,
-  immed:true, eqeqeq:true, forin:true, latedef:true,
-  newcap:true, noarg:true, undef:true */
-/*global describe:true, it:true, XT:true, XM:true, XV:true, process:true,
-  module:true, require:true, exports:true */
-
-(function () {
-  "use strict";
-
-  var crud = require("../lib/crud"),
-    assert = require("chai").assert;
-   /**
-  @class
-  @alias CreditCard
-  @property {String} id
-  @property {String} sequence
-  @property {Customer} Customer
-  @property {Boolean} isActive
-  @property {Name} Name
-  @property {String} Address1
-  @property {String} Address2
-  @property {String} City
-  @property {String} State
-  @property {String} Zip
-  @property {Country} Country
-  @property {Number} Number
-  @property {Date} monthExpired
-  @property {Date} yearExpired
-  @property {Boolean} isDebit
-  @property {String} CreditCardType
-  **/
-  var spec = {
-    recordType: "XM.CreditCard",
-    enforceUpperKey: false,
-    collectionType: "XM.CreditCardCollection",
-    listKind: "XV.CreditCardList",
-    instanceOf: "XM.Model",
-    attributes: ["id", "uuid", "sequence", "customer", "isActive", "name", "address1", "address2",
-    "city", "state", "zip", "country", "number", "monthExpired", "yearExpired", "isDebit",
-    "creditCardType"],
-    idAttribute: "uuid",
-    /**
-      @member -
-      @memberof CreditCard
-      @description Used in the Sales and billing modules
-    */
-    extensions: ["sales"],
-    /**
-      @member -
-      @memberof CreditCard
-      @description CreditCards are not lockable.
-    */
-    isLockable: false,
-    /**
-    @member -
-    @memberof CreditCard
-    @description The Credit Card collection is cached.
-    */
-    cacheName: null,
-    /**
-      @member -
-      @memberof CreditCard
-      @description CreditCards can be created and updated by users with the "ProcessCreditCards"
-      privilege but cannot be deleted
-    */
-    privileges: {
-      createUpdate: "ProcessCreditCards",
-      read: "ProcessCreditCards"
-    },
-    createHash : {
-      customer: 102, // XRETAIL. Not a nested object because it's not a toOne from CreditCard
-      creditCardType: "V",
-      name: "John Smith",
-      address1: "123 Main Street",
-      city: "Norfolk",
-      state: "VA",
-      zip: "23510",
-      country: "USA",
-      monthExpired: "05",
-      yearExpired: "2010",
-      number: "4111111111111111",
-      sequence: 500
-    },
-    updateHash: {
-      creditCardType: "M",
-      number: "1234123412341234",
-      sequence: 550
-    },
-    /**
-      @member -
-      @memberof CreditCard
-      @description First 12 digits of the credit card number should be masked
-    */
-    afterSaveActions: [{
-      it: "should mask the first 12 digits of the credit card number",
-      action: function (data, next) {
-        assert.equal(data.model.get("sequence"), 500);
-        assert.equal(data.model.get("name"), "John Smith");
-        assert.equal(data.model.get("number"), "************1111");
-        next();
-      }
-    }],
-    /**
-      @member -
-      @memberof CreditCard
-      @description User should not be allowed to update the number/type of the Credit Card
-    */
-    beforeDeleteActions: [{
-      it: "should not allow an update to the number or type",
-      action: function (data, next) {
-        assert.equal(data.model.get("sequence"), 550);
-        assert.equal(data.model.get("creditCardType"), "V");
-        assert.equal(data.model.get("number"), "************1111");
-        next();
-      }
-    }],
-    skipSmoke: true, // credit card is not a first-class business object with its own list
-    skipDelete: true
-  };
-  exports.spec = spec;
-}());

diff --git a/test/specs/customer.js b/test/specs/customer.js
index c7278b0..f710558 100644 (file)
--- a/test/specs/customer.js
+++ b/test/specs/customer.js
@@ -138,6 +138,7 @@ it:true, describe:true, beforeEach:true, before:true, enyo:true */
           };
         creditCardModel.on("change:uuid", setCreditCard);
         creditCardModel.initialize(null, {isNew: true});
+        assert.isTrue(creditCardModel.canEdit("creditCardType"));
       }
     }],
     afterSaveActions: [{
@@ -146,6 +147,13 @@ it:true, describe:true, beforeEach:true, before:true, enyo:true */
         assert.equal(data.model.get("creditCards").models[0].get("number"), "************1111");
         next();
       }
+    }, {
+      it: "should not allow an edit to the saved credit card",
+      action: function (data, next) {
+        var creditCardModel = data.model.get("creditCards").models[0];
+        assert.isFalse(creditCardModel.canEdit("creditCardType"));
+        next();
+      }
     }],
     beforeDeleteActions: crud.accountBeforeDeleteActions,
     afterDeleteActions: crud.accountAfterDeleteActions