fix: fix globbed asset sorting and deduping

pvdlg · pvdlg · commit 83444bf373f7 · 2018-10-26T12:37:34.000-04:00
diff --git a/lib/glob-assets.js b/lib/glob-assets.js
@@ -65,7 +65,7 @@ module.exports = async ({cwd}, assets) =>
           // Sort with Object first, to prioritize Object definition over Strings in dedup
         ))
       )
-      .sort(asset => !isPlainObject(asset)),
+      .sort(asset => (isPlainObject(asset) ? -1 : 1)),
     // Compare `path` property if Object definition, value itself if String
     (a, b) => path.resolve(cwd, isPlainObject(a) ? a.path : a) === path.resolve(cwd, isPlainObject(b) ? b.path : b)
   );
diff --git a/test/integration.test.js b/test/integration.test.js
@@ -131,9 +131,8 @@ test.serial('Publish a release with an array of assets', async t => {
   const repo = 'test_repo';
   const env = {GITHUB_TOKEN: 'github_token'};
   const assets = [
-    'upload.txt',
-    {path: ['*.txt', '!**/*_other.txt'], name: 'upload_file_name.txt'},
-    {path: ['*.txt'], name: 'other_file.txt', label: 'Other File'},
+    {path: ['upload.txt'], name: 'upload_file_name.txt'},
+    {path: ['upload_other.txt'], name: 'other_file.txt', label: 'Other File'},
   ];
   const nextRelease = {version: '1.0.0', gitHead: '123', gitTag: 'v1.0.0', notes: 'Test release note body'};
   const options = {branch: 'master', repositoryUrl: `https://github.com/${owner}/${repo}.git`};
@@ -163,7 +162,7 @@ test.serial('Publish a release with an array of assets', async t => {
     uploadUrl: 'https://github.com',
     contentLength: (await stat(path.resolve(cwd, 'upload_other.txt'))).size,
   })
-    .post(`${uploadUri}?name=${escape('upload_other.txt')}&label=${escape('Other File')}`)
+    .post(`${uploadUri}?name=${escape('other_file.txt')}&label=${escape('Other File')}`)
     .reply(200, {browser_download_url: otherAssetUrl});
 
   const result = await t.context.m.publish({assets}, {cwd, env, options, nextRelease, logger: t.context.logger});

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ module.exports = async ({cwd}, assets) =>`
`65`	`65`	`// Sort with Object first, to prioritize Object definition over Strings in dedup`
`66`	`66`	`))`
`67`	`67`	`)`
`68`		`- .sort(asset => !isPlainObject(asset)),`
	`68`	`+ .sort(asset => (isPlainObject(asset) ? -1 : 1)),`
`69`	`69`	// Compare `path` property if Object definition, value itself if String
`70`	`70`	`(a, b) => path.resolve(cwd, isPlainObject(a) ? a.path : a) === path.resolve(cwd, isPlainObject(b) ? b.path : b)`
`71`	`71`	`);`