@amanat-qa/utils-frontend 5.1.6 → 5.2.1

package/dist/data/gitlabCIGenerator.js

@@ -35,7 +35,7 @@ var jobs = testSuites.map(function (suite) {
     tags: ['k8s'],
     before_script: [
     // eslint-disable-next-line no-template-curly-in-string
-    'echo "${ENV_TEST}" | tr -d \'\\r\' > ./.env.test', 'docker login --username $USER --password $PASS registry.gitlab.com', projectName === 'amanat24' ? 'echo "Не обращайте на эту строку внимания"' : 'service docker start', 'npm ci --prefix ./cypress', 'npm run lint --prefix ./cypress'],
+    'echo "${ENV_TEST}" | tr -d \'\\r\' > ./.env.test', 'docker login --username $USER --password $PASS registry.gitlab.com', projectName === 'amanat24' ? 'echo "Не обращайте на эту строку внимания"' : 'service docker start', 'npm ci --prefix ./cypress', 'npm run lint --prefix ./cypress', "TARGET_REPO=\"https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/amanatpolicy/amanat-digital-platform/adp_nuxt.git\"\nFULL_SHA=$(git ls-remote $TARGET_REPO dev | awk '{print $1}')\nLATEST_COMMIT=${FULL_SHA:0:8}\necho \"Using commit: $LATEST_COMMIT\"\nexport LATEST_COMMIT=$LATEST_COMMIT"],
     script: ['npm run start:ci --prefix ./cypress', "file=".concat(suite, " npm run test --prefix ./cypress")],
     artifacts: {
       when: 'always',

package/dist/enums/dateFormats.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var DateFormats = Object.freeze({
+  DMY: 'DD.MM.YYYY',
+  YMD: 'YYYY-MM-DD',
+  MDY: 'MM.DD.YYYY',
+  YMDHms: 'YYYY-MM-DD[T]HH:mm:ss'
+});
+module.exports = DateFormats;

package/dist/index.browser.js

@@ -5,6 +5,7 @@
 exports.BaseAPI = require('./API/baseAPI');
 exports.JSONLoader = require('./data/JSONLoader');
 exports.DataUtils = require('./data/dataUtils');
+exports.DateFormats = require('./enums/dateFormats');
 exports.Logger = require('./log/logger');
 exports.Randomizer = require('./random/randomizer');
 exports.StrUtils = require('./str/strUtils');

package/dist/index.node.js

@@ -9,6 +9,7 @@ exports.JSONLoader = require('./data/JSONLoader');
 exports.DataUtils = require('./data/dataUtils');
 exports.filesParser = require('./data/filesParser');
 exports.gitlabCIGenerator = require('./data/gitlabCIGenerator');
+exports.DateFormats = require('./enums/dateFormats');
 exports.Logger = require('./log/logger');
 exports.Randomizer = require('./random/randomizer');
 exports.StrUtils = require('./str/strUtils');

package/dist/time/timeUtils.js

@@ -7,7 +7,7 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var moment = require('moment');
-var JSONLoader = require('../data/JSONLoader');
+var DateFormats = require('../enums/dateFormats');
 var TimeUtils = /*#__PURE__*/function () {
   function TimeUtils() {
     _classCallCheck(this, TimeUtils);
@@ -29,18 +29,18 @@ var TimeUtils = /*#__PURE__*/function () {
       }
       var finishDate;
       if (reverseInterval) {
-        finishDate = dateBegin ? moment(dateBegin, JSONLoader.testData.datesFormatDMY).subtract(count, unitOfTime) : moment(startDate).subtract(count, unitOfTime);
+        finishDate = dateBegin ? moment(dateBegin, DateFormats.DMY).subtract(count, unitOfTime) : moment(startDate).subtract(count, unitOfTime);
         if (isNotIncluded) {
           finishDate = moment(finishDate).add(1, 'days');
         }
       } else {
-        finishDate = dateBegin ? moment(dateBegin, JSONLoader.testData.datesFormatDMY).add(count, unitOfTime) : moment(startDate).add(count, unitOfTime);
+        finishDate = dateBegin ? moment(dateBegin, DateFormats.DMY).add(count, unitOfTime) : moment(startDate).add(count, unitOfTime);
         if (isNotIncluded) {
           finishDate = moment(finishDate).subtract(1, 'days');
         }
       }
-      startDate = moment(startDate).format(JSONLoader.testData.datesFormatDMY);
-      finishDate = moment(finishDate).format(JSONLoader.testData.datesFormatDMY);
+      startDate = moment(startDate).format(DateFormats.DMY);
+      finishDate = moment(finishDate).format(DateFormats.DMY);
       return reverseInterval ? {
         startDate: finishDate,
         finishDate: dateBegin !== null && dateBegin !== void 0 ? dateBegin : startDate
@@ -52,12 +52,18 @@ var TimeUtils = /*#__PURE__*/function () {
   }, {
     key: "reformatDateFromYMDToDMY",
     value: function reformatDateFromYMDToDMY(date) {
-      return moment(date, JSONLoader.testData.datesFormatYMD).format(JSONLoader.testData.datesFormatDMY);
+      return moment(date, DateFormats.YMD).format(DateFormats.DMY);
     }
   }, {
     key: "reformatDateFromDMYToYMD",
     value: function reformatDateFromDMYToYMD(date) {
-      return moment(date, JSONLoader.testData.datesFormatDMY).format(JSONLoader.testData.datesFormatYMD);
+      return moment(date, DateFormats.DMY).format(DateFormats.YMD);
+    }
+  }, {
+    key: "today",
+    value: function today() {
+      var format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DateFormats.DMY;
+      return moment().format(format);
     }
   }]);
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amanat-qa/utils-frontend",
-  "version": "5.1.6",
+  "version": "5.2.1",
   "publishConfig": {
     "access": "public"
   },
@@ -24,6 +24,7 @@
     "./dataUtils": "./dist/data/dataUtils.js",
     "./filesParser": "./dist/data/filesParser.js",
     "./gitlabCIGenerator": "./dist/data/gitlabCIGenerator.js",
+    "./dateFormats": "./dist/enums/dateFormats.js",
     "./logger": "./dist/log/logger.js",
     "./randomizer": "./dist/random/randomizer.js",
     "./strUtils": "./dist/str/strUtils.js",