@serenity-js/assertions 3.10.4 → 3.11.1

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.11.1](https://github.com/serenity-js/serenity-js/compare/v3.11.0...v3.11.1) (2023-10-04)
+
+**Note:** Version bump only for package @serenity-js/assertions
+
+
+
+
+
+# [3.11.0](https://github.com/serenity-js/serenity-js/compare/v3.10.4...v3.11.0) (2023-10-03)
+
+
+### Features
+
+* **assertions:** isBefore and isAfter accept Timestamp as well as Date objects ([55e13d0](https://github.com/serenity-js/serenity-js/commit/55e13d00a447c0ec70dd496fb7948f171977a682))
+
+
+
+
+
 ## [3.10.4](https://github.com/serenity-js/serenity-js/compare/v3.10.3...v3.10.4) (2023-09-22)
 
 **Note:** Version bump only for package @serenity-js/assertions

package/lib/expectations/isAfter.d.ts

@@ -1,4 +1,4 @@
-import { Expectation } from '@serenity-js/core';
+import { Expectation, type Timestamp } from '@serenity-js/core';
 /**
  * Creates an {@apilink Expectation|expectation} that is met when the actual value of type `Date`
  * is after the expected `Date`.
@@ -38,5 +38,5 @@ import { Expectation } from '@serenity-js/core';
  *
  * @group Expectations
  */
-export declare const isAfter: (expected: import("@serenity-js/core").Answerable<Date>) => Expectation<Date>;
+export declare const isAfter: (expected: import("@serenity-js/core").Answerable<Date | Timestamp>) => Expectation<Date | Timestamp>;
 //# sourceMappingURL=isAfter.d.ts.map

package/lib/expectations/isAfter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isAfter.d.ts","sourceRoot":"","sources":["../../src/expectations/isAfter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,OAAO,+EAInB,CAAC"}
+{"version":3,"file":"isAfter.d.ts","sourceRoot":"","sources":["../../src/expectations/isAfter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,OAAO,uGAanB,CAAC"}

package/lib/expectations/isAfter.js

@@ -41,5 +41,13 @@ const core_1 = require("@serenity-js/core");
  *
  * @group Expectations
  */
-exports.isAfter = core_1.Expectation.define('isAfter', 'have value that is after', (actual, expected) => actual.getTime() > expected.getTime());
+exports.isAfter = core_1.Expectation.define('isAfter', 'have value that is after', (actual, expected) => {
+    const actualInMilliseconds = actual instanceof Date
+        ? actual.getTime()
+        : actual.toMilliseconds();
+    const expectedInMilliseconds = expected instanceof Date
+        ? expected.getTime()
+        : expected.toMilliseconds();
+    return actualInMilliseconds > expectedInMilliseconds;
+});
 //# sourceMappingURL=isAfter.js.map

package/lib/expectations/isAfter.js.map

@@ -1 +1 @@
-{"version":3,"file":"isAfter.js","sourceRoot":"","sources":["../../src/expectations/isAfter.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACU,QAAA,OAAO,GAAG,kBAAW,CAAC,MAAM,CACrC,SAAS,EAAE,0BAA0B,EACrC,CAAC,MAAY,EAAE,QAAc,EAAE,EAAE,CAC7B,MAAM,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,CAC5C,CAAC"}
+{"version":3,"file":"isAfter.js","sourceRoot":"","sources":["../../src/expectations/isAfter.ts"],"names":[],"mappings":";;;AAAA,4CAAgE;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACU,QAAA,OAAO,GAAG,kBAAW,CAAC,MAAM,CACrC,SAAS,EAAE,0BAA0B,EACrC,CAAC,MAAwB,EAAE,QAA0B,EAAE,EAAE;IACrD,MAAM,oBAAoB,GAAG,MAAM,YAAY,IAAI;QAC/C,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE;QAClB,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IAE9B,MAAM,sBAAsB,GAAG,QAAQ,YAAY,IAAI;QACnD,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE;QACpB,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;IAEhC,OAAO,oBAAoB,GAAG,sBAAsB,CAAC;AACzD,CAAC,CACJ,CAAC"}

package/lib/expectations/isBefore.d.ts

@@ -1,4 +1,4 @@
-import { Expectation } from '@serenity-js/core';
+import { Expectation, type Timestamp } from '@serenity-js/core';
 /**
  * Creates an {@apilink Expectation|expectation} that is met when the actual value of type `Date`
  * is before the expected `Date`.
@@ -38,5 +38,5 @@ import { Expectation } from '@serenity-js/core';
  *
  * @group Expectations
  */
-export declare const isBefore: (expected: import("@serenity-js/core").Answerable<Date>) => Expectation<Date>;
+export declare const isBefore: (expected: import("@serenity-js/core").Answerable<Date | Timestamp>) => Expectation<Date | Timestamp>;
 //# sourceMappingURL=isBefore.d.ts.map

package/lib/expectations/isBefore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isBefore.d.ts","sourceRoot":"","sources":["../../src/expectations/isBefore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,QAAQ,+EAIpB,CAAC"}
+{"version":3,"file":"isBefore.d.ts","sourceRoot":"","sources":["../../src/expectations/isBefore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,QAAQ,uGAcpB,CAAC"}

package/lib/expectations/isBefore.js

@@ -41,5 +41,13 @@ const core_1 = require("@serenity-js/core");
  *
  * @group Expectations
  */
-exports.isBefore = core_1.Expectation.define('isBefore', 'have value that is before', (actual, expected) => actual.getTime() < expected.getTime());
+exports.isBefore = core_1.Expectation.define('isBefore', 'have value that is before', (actual, expected) => {
+    const actualInMilliseconds = actual instanceof Date
+        ? actual.getTime()
+        : actual.toMilliseconds();
+    const expectedInMilliseconds = expected instanceof Date
+        ? expected.getTime()
+        : expected.toMilliseconds();
+    return actualInMilliseconds < expectedInMilliseconds;
+});
 //# sourceMappingURL=isBefore.js.map

package/lib/expectations/isBefore.js.map

@@ -1 +1 @@
-{"version":3,"file":"isBefore.js","sourceRoot":"","sources":["../../src/expectations/isBefore.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACU,QAAA,QAAQ,GAAG,kBAAW,CAAC,MAAM,CACtC,UAAU,EAAE,2BAA2B,EACvC,CAAC,MAAY,EAAE,QAAc,EAAE,EAAE,CAC7B,MAAM,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,CAC5C,CAAC"}
+{"version":3,"file":"isBefore.js","sourceRoot":"","sources":["../../src/expectations/isBefore.ts"],"names":[],"mappings":";;;AAAA,4CAAgE;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACU,QAAA,QAAQ,GAAG,kBAAW,CAAC,MAAM,CACtC,UAAU,EAAE,2BAA2B,EACvC,CAAC,MAAwB,EAAE,QAA0B,EAAE,EAAE;IAErD,MAAM,oBAAoB,GAAG,MAAM,YAAY,IAAI;QAC/C,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE;QAClB,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IAE9B,MAAM,sBAAsB,GAAG,QAAQ,YAAY,IAAI;QACnD,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE;QACpB,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;IAEhC,OAAO,oBAAoB,GAAG,sBAAsB,CAAC;AACzD,CAAC,CACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/assertions",
-  "version": "3.10.4",
+  "version": "3.11.1",
   "description": "Screenplay-style assertion library",
   "author": {
     "name": "Jan Molak",
@@ -43,18 +43,18 @@
     "node": "^16.13 || ^18.12 || ^20"
   },
   "dependencies": {
-    "@serenity-js/core": "3.10.4",
+    "@serenity-js/core": "3.11.1",
     "tiny-types": "^1.20.0"
   },
   "devDependencies": {
     "@integration/testing-tools": "3.0.0",
     "@types/chai": "^4.3.6",
-    "@types/mocha": "^10.0.1",
+    "@types/mocha": "^10.0.2",
     "c8": "8.0.1",
     "mocha": "^10.2.0",
     "mocha-multi": "^1.1.7",
     "ts-node": "^10.9.1",
     "typescript": "5.1.6"
   },
-  "gitHead": "28f12bd6029a9a6c1d8e492486138bf0c83916cd"
+  "gitHead": "b3e36f6e42eb2c545afa961946469fb6dd93f4df"
 }

package/src/expectations/isAfter.ts

@@ -1,4 +1,4 @@
-import { Expectation } from '@serenity-js/core';
+import { Expectation, type Timestamp } from '@serenity-js/core';
 
 /**
  * Creates an {@apilink Expectation|expectation} that is met when the actual value of type `Date`
@@ -41,6 +41,15 @@ import { Expectation } from '@serenity-js/core';
  */
 export const isAfter = Expectation.define(
     'isAfter', 'have value that is after',
-    (actual: Date, expected: Date) =>
-        actual.getTime() > expected.getTime()
+    (actual: Date | Timestamp, expected: Date | Timestamp) => {
+        const actualInMilliseconds = actual instanceof Date
+            ? actual.getTime()
+            : actual.toMilliseconds();
+
+        const expectedInMilliseconds = expected instanceof Date
+            ? expected.getTime()
+            : expected.toMilliseconds();
+
+        return actualInMilliseconds > expectedInMilliseconds;
+    }
 );

package/src/expectations/isBefore.ts

@@ -1,4 +1,4 @@
-import { Expectation } from '@serenity-js/core';
+import { Expectation, type Timestamp } from '@serenity-js/core';
 
 /**
  * Creates an {@apilink Expectation|expectation} that is met when the actual value of type `Date`
@@ -41,6 +41,16 @@ import { Expectation } from '@serenity-js/core';
  */
 export const isBefore = Expectation.define(
     'isBefore', 'have value that is before',
-    (actual: Date, expected: Date) =>
-        actual.getTime() < expected.getTime()
+    (actual: Date | Timestamp, expected: Date | Timestamp) => {
+
+        const actualInMilliseconds = actual instanceof Date
+            ? actual.getTime()
+            : actual.toMilliseconds();
+
+        const expectedInMilliseconds = expected instanceof Date
+            ? expected.getTime()
+            : expected.toMilliseconds();
+
+        return actualInMilliseconds < expectedInMilliseconds;
+    }
 );