fix: merge conflict from master

ali-sdk · Jan 5, 2021 · 860cf32 · 860cf32
1 parent eff95ae
commit 860cf32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2390,7 +2390,7 @@ console.log(result.objects);
 const result = await store.listV2({
   delimiter: '/',
   prefix: 'a/',
-  'start-after': 'a/b
+  'start-after': 'a/b'
 });
 console.log(result.objects);
 ```

diff --git a/lib/object.js b/lib/object.js
@@ -221,8 +221,7 @@ proto.list = async function list(query, options) {
     objects,
     prefixes,
     nextMarker: result.data.NextMarker || null,
-    isTruncated: result.data.IsTruncated 
-    'true'
+    isTruncated: result.data.IsTruncated === 'true'
   };
 };
 

diff --git a/test/node/object.test.js b/test/node/object.test.js
@@ -2283,13 +2283,12 @@ describe('test/object.test.js', () => {
           }
         };
 
-        const postFile = () =>
-          new Promise((resolve, reject) => {
-            request(options, (err, res) => {
-              if (err) reject(err);
-              if (res) resolve(res);
-            });
+        const postFile = () => new Promise((resolve, reject) => {
+          request(options, (err, res) => {
+            if (err) reject(err);
+            if (res) resolve(res);
           });
+        });
 
         const result = await postFile();
         assert(result.statusCode === 204);