Test: Convert es2018/rejects.js to main/assert-es6.js

Follows-up bf1406e.
qunitjs · Jul 8, 2024 · 218adec · 218adec
1 parent c40934f
commit 218adec
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 84 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -117,8 +117,8 @@ module.exports = function (grunt) {
 
         // Sync with test/index.html
         'test/main/assert.js',
+        'test/main/assert-es6.js',
         'test/main/assert-step.js',
-        'test/main/assert-throws-es6.js',
         'test/main/assert-timeout.js',
         'test/main/async.js',
         'test/main/deepEqual.js',
@@ -143,8 +143,7 @@ module.exports = function (grunt) {
         'test/node/storage-1.js',
         'test/node/storage-2.js',
 
-        'test/es2018/async-functions.js',
-        'test/es2018/rejects.js'
+        'test/es2018/async-functions.js'
       ]
     }
   });

diff --git a/test/es2018/rejects.js b/test/es2018/rejects.js
diff --git a/test/index.html b/test/index.html
@@ -11,8 +11,8 @@
   </script>
 
   <script src="main/assert.js"></script>
+  <script src="main/assert-es6.js"></script>
   <script src="main/assert-step.js"></script>
-  <script src="main/assert-throws-es6.js"></script>
   <script src="main/assert-timeout.js"></script>
   <script src="main/async.js"></script>
   <script src="main/deepEqual.js"></script>

diff --git a/test/main/assert-throws-es6.js → test/main/assert-es6.js b/test/main/assert-throws-es6.js → test/main/assert-es6.js
@@ -1,4 +1,4 @@
-QUnit.module('assert.throws [es6]', function () {
+QUnit.module('assert [es6]', function () {
   function CustomError (message) {
     this.message = message;
   }
@@ -18,6 +18,15 @@ QUnit.module('assert.throws [es6]', function () {
     );
   });
 
+  QUnit.test('rejects [matcher arrow function]', function (assert) {
+    assert.rejects(
+      Promise.reject(new CustomError('some error description')),
+      err => {
+        return err instanceof CustomError && /description/.test(err);
+      }
+    );
+  });
+
   QUnit.test('throws [matcher Error subclass]', function (assert) {
     class CustomError extends Error {}
 
@@ -29,6 +38,15 @@ QUnit.module('assert.throws [es6]', function () {
     );
   });
 
+  QUnit.test('rejects [matcher Error subclass]', function (assert) {
+    class CustomError extends Error {}
+
+    assert.rejects(
+      Promise.reject(new CustomError('foo')),
+      CustomError
+    );
+  });
+
   // TODO: Once we run browser tests with QTap, remove this hack
   // and instead write expected failures in .tap.txt snapshots.
   QUnit.module('failing assertions', function (hooks) {
@@ -64,6 +82,18 @@ QUnit.module('assert.throws [es6]', function () {
       );
     });
 
+    QUnit.test('rejects [matcher arrow fn returns false]', function (assert) {
+      this.expectedFailure = {
+        actual: 'Error: foo',
+        expected: /^null$/
+      };
+
+      assert.rejects(
+        Promise.reject(new Error('foo')),
+        () => false
+      );
+    });
+
     QUnit.test('throws [graceful failure when class given as matcher]', function (assert) {
       // Avoid uncaught "Died on test" and instead report it
       // gracefully as an assertion failure
@@ -84,5 +114,18 @@ QUnit.module('assert.throws [es6]', function () {
         CustomError
       );
     });
+
+    QUnit.test('rejects [graceful failure when class given as matcher]', function (assert) {
+      this.expectedFailure = {
+        actual: 'Error: foo',
+        expected: /^TypeError: .*[Cc]lass constructors? .*\bnew/
+      };
+
+      class CustomError extends Error {}
+      assert.rejects(
+        Promise.reject(new Error('foo')),
+        CustomError
+      );
+    });
   });
 });
diff --git a/test/mozjs.js b/test/mozjs.js
@@ -13,8 +13,8 @@ QUnit.on('runEnd', (suiteEnd) => {
 
 // Sync with test/index.html
 loadRelativeToScript('../test/main/assert.js');
+loadRelativeToScript('../test/main/assert-es6.js');
 loadRelativeToScript('../test/main/assert-step.js');
-loadRelativeToScript('../test/main/assert-throws-es6.js');
 // loadRelativeToScript( "../test/main/assert-timeout.js" ); // Requires setTimeout
 // loadRelativeToScript( "../test/main/async.js" ); // Requires setTimeout
 loadRelativeToScript('../test/main/deepEqual.js');

diff --git a/test/webWorker-worker.js b/test/webWorker-worker.js
@@ -7,8 +7,8 @@ importScripts(
 
   // Sync with test/index.html
   'main/assert.js',
+  'main/assert-es6.js',
   'main/assert-step.js',
-  'main/assert-throws-es6.js',
   'main/assert-timeout.js',
   'main/async.js',
   'main/deepEqual.js',