Merge 120ee73 into 7d3b2ef

lib/assertions.js

@@ -1605,7 +1605,10 @@ module.exports = expect => {
                   toSatisfyMatrix[aIndex][bIndex] = err;
                   return false;
                 }
-                result.then(() => {}, () => {});
+                result.then(
+                  () => {},
+                  () => {}
+                );
                 if (result.isPending()) {
                   isAsync = true;
                   return false;
@@ -2247,7 +2250,10 @@ module.exports = expect => {
 
   expect.addAssertion('<function> to be rejected', (expect, subject) => {
     expect.errorMode = 'nested';
-    return expect(expect.promise(() => subject()), 'to be rejected');
+    return expect(
+      expect.promise(() => subject()),
+      'to be rejected'
+    );
   });
 
   expect.addAssertion(
@@ -2310,7 +2316,10 @@ module.exports = expect => {
 
   expect.addAssertion('<function> to be fulfilled', (expect, subject) => {
     expect.errorMode = 'nested';
-    return expect(expect.promise(() => subject()), 'to be fulfilled');
+    return expect(
+      expect.promise(() => subject()),
+      'to be fulfilled'
+    );
   });
 
   expect.addAssertion(
@@ -2396,7 +2405,11 @@ module.exports = expect => {
     '<function> when rejected <assertion>',
     (expect, subject, ...rest) => {
       expect.errorMode = 'nested';
-      return expect(expect.promise(() => subject()), 'when rejected', ...rest);
+      return expect(
+        expect.promise(() => subject()),
+        'when rejected',
+        ...rest
+      );
     }
   );
 
@@ -2442,7 +2455,11 @@ module.exports = expect => {
     '<function> when fulfilled <assertion>',
     (expect, subject, ...rest) => {
       expect.errorMode = 'nested';
-      return expect(expect.promise(() => subject()), 'when fulfilled', ...rest);
+      return expect(
+        expect.promise(() => subject()),
+        'when fulfilled',
+        ...rest
+      );
     }
   );
 

lib/createTopLevelExpect.js

@@ -815,7 +815,7 @@ expectPrototype.addType = function(type, childExpect) {
   }
 
   extendedType.inspect = function(obj, depth, output, inspect) {
-    if (arguments.length < 2 || (!output || !output.isMagicPen)) {
+    if (arguments.length < 2 || !output || !output.isMagicPen) {
       return `type: ${type.name}`;
     } else if (childExpect) {
       const childOutput = childExpect.createOutput(output.format);

package.json

@@ -63,7 +63,7 @@
     "node-version-check": "^2.2.0",
     "nyc": "^14.0.0",
     "offline-github-changelog": "^1.6.1",
-    "prettier": "~1.18.2",
+    "prettier": "~1.19.1",
     "rollup": "^1.0.1",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-multi-entry": "^2.1.0",

test/assertions/to-have-items-satisfying.spec.js

@@ -215,7 +215,11 @@ describe('to have items satisfying assertion', () => {
     expect(
       function() {
         expect(
-          [[0, 1, 2], [4, '5', 6], [7, 8, '9']],
+          [
+            [0, 1, 2],
+            [4, '5', 6],
+            [7, 8, '9']
+          ],
           'to have items satisfying',
           // prettier-ignore
           expect.it(function(arr) {

test/assertions/to-have-values-satisfying.spec.js

@@ -33,7 +33,11 @@ describe('to have values satisfying assertion', () => {
   it('only accepts objects and arrays as the target', () => {
     expect(
       function() {
-        expect(42, 'to have values satisfying', expect.it(function(value) {}));
+        expect(
+          42,
+          'to have values satisfying',
+          expect.it(function(value) {})
+        );
       },
       'to throw',
       'expected 42 to have values satisfying expect.it(function (value) {})\n' +

test/assertions/when-passed-as-parameter-to.spec.js

@@ -36,7 +36,10 @@ describe('when passed as parameters to assertion', () => {
 
   it('should combine with other assertions (showcase)', () => {
     expect(
-      [[1, 2], [3, 4]],
+      [
+        [1, 2],
+        [3, 4]
+      ],
       'to have items satisfying',
       'when passed as parameters to',
       add,

test/types/Promise-type.spec.js

@@ -54,7 +54,10 @@ describe('Promise type', () => {
   describe('with a Bluebird promise (that supports synchronous inspection)', () => {
     it('should inspect a pending promise', () => {
       var promise = expect.promise(function(run) {
-        setTimeout(run(function() {}), 0);
+        setTimeout(
+          run(function() {}),
+          0
+        );
       });
       expect(promise, 'to inspect as', 'Promise (pending)');
       return promise;

test/utils.spec.js

@@ -54,11 +54,19 @@ describe('utils', () => {
 
     describe('#getFunctionName', () => {
       it('should return the name of a named function', () => {
-        expect(utils.getFunctionName(function foo() {}), 'to equal', 'foo');
+        expect(
+          utils.getFunctionName(function foo() {}),
+          'to equal',
+          'foo'
+        );
       });
 
       it('should return the empty string for an anonymous function', () => {
-        expect(utils.getFunctionName(function() {}), 'to equal', '');
+        expect(
+          utils.getFunctionName(function() {}),
+          'to equal',
+          ''
+        );
       });
 
       describe('with Function.prototype.toString mocked out', () => {