Merge d7caa50 into 8fa7343

unexpectedjs · Jun 9, 2019 · 4044d22 · 4044d22
2 parents 8fa7343 + d7caa50
commit 4044d22
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/lib/assertions.js b/lib/assertions.js
@@ -563,9 +563,7 @@ module.exports = expect => {
     args.forEach(arg => {
       if (arg === '') {
         throw new Error(
-          `The '${
-            expect.testDescription
-          }' assertion does not support the empty string`
+          `The '${expect.testDescription}' assertion does not support the empty string`
         );
       }
     });
@@ -697,9 +695,7 @@ module.exports = expect => {
     (expect, subject, value) => {
       if (value === '') {
         throw new Error(
-          `The '${
-            expect.testDescription
-          }' assertion does not support a prefix of the empty string`
+          `The '${expect.testDescription}' assertion does not support a prefix of the empty string`
         );
       }
       var isTruncated = false;
@@ -757,9 +753,7 @@ module.exports = expect => {
     (expect, subject, value) => {
       if (value === '') {
         throw new Error(
-          `The '${
-            expect.testDescription
-          }' assertion does not support a suffix of the empty string`
+          `The '${expect.testDescription}' assertion does not support a suffix of the empty string`
         );
       }
       var isTruncated = false;

diff --git a/lib/createTopLevelExpect.js b/lib/createTopLevelExpect.js
@@ -747,9 +747,7 @@ expectPrototype.addType = function(type, childExpect) {
 
   if (typeof type.identify !== 'function' && type.identify !== false) {
     throw new Error(
-      `Type ${
-        type.name
-      } must specify an identify function or be declared abstract by setting identify to false`
+      `Type ${type.name} must specify an identify function or be declared abstract by setting identify to false`
     );
   }
 

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "node-version-check": "^2.2.0",
     "nyc": "^14.0.0",
     "offline-github-changelog": "^1.6.1",
-    "prettier": "~1.17.0",
+    "prettier": "~1.18.2",
     "rollup": "^1.0.1",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-node-globals": "^1.1.0",

diff --git a/vendor/rsvp.js b/vendor/rsvp.js
@@ -1 +1 @@
-../node_modules/rsvp/dist/rsvp.min.js
+../node_modules/rsvp/dist/rsvp.js