fix -darwin.zip asset name, restructure tests

Author: juliangruber

index.js

@@ -72,7 +72,7 @@ class Updates {
 }
 
 const assetPlatform = fileName => {
-  if (/.*mac.*\.zip/.test(fileName)) return 'darwin'
+  if (/.*(mac|darwin).*\.zip/.test(fileName)) return 'darwin'
   return false
 }
 

test/index.js

@@ -18,34 +18,56 @@ const createServer = () =>
 test('Updates', async t => {
   const { server, address } = await createServer()
 
-  let res = await fetch(`${address}/`)
-  t.equal(res.status, 404)
-
-  // exists and has update
-  res = await fetch(`${address}/dat-land/dat-desktop/darwin/1.0.0`)
-  t.equal(res.status, 200)
-  const body = await res.json()
-  t.ok(body.name)
-  t.match(body.url, /-mac\.zip$/)
-  t.ok(body.notes)
-
-  // exists but no updates
-  res = await fetch(
-    `https://api.github.com/repos/dat-land/dat-desktop/releases?per_page=1`
-  )
-  const releases = await res.json()
-  res = await fetch(
-    `${address}/dat-land/dat-desktop/darwin/${releases[0].name}`
-  )
-  t.equal(res.status, 204)
-
-  // exists but has no releases
-  res = await fetch(`${address}/juliangruber/brace-expansion/darwin/0.0.0`)
-  t.equal(res.status, 404)
-
-  // doesn't exist
-  res = await fetch(`${address}/doesnot/exist-123123123/darwin/0.0.0`)
-  t.equal(res.status, 404)
+  await t.test('Routes', async t => {
+    const res = await fetch(`${address}/`)
+    t.equal(res.status, 404)
+
+    await t.test('exists and has update', async t => {
+      const res = await fetch(`${address}/dat-land/dat-desktop/darwin/1.0.0`)
+      t.equal(res.status, 200)
+      const body = await res.json()
+      t.ok(body.name)
+      t.match(body.url, /-mac\.zip$/)
+      t.ok(body.notes)
+    })
+
+    await t.test('exists but no updates', async t => {
+      let res = await fetch(
+        `https://api.github.com/repos/dat-land/dat-desktop/releases?per_page=1`
+      )
+      const releases = await res.json()
+      res = await fetch(
+        `${address}/dat-land/dat-desktop/darwin/${releases[0].name}`
+      )
+      t.equal(res.status, 204)
+    })
+
+    await t.test('exists but has no releases', async t => {
+      const res = await fetch(
+        `${address}/juliangruber/brace-expansion/darwin/0.0.0`
+      )
+      t.equal(res.status, 404)
+    })
+
+    await t.test("doesn't exist", async t => {
+      const res = await fetch(`${address}/doesnot/exist-123123123/darwin/0.0.0`)
+      t.equal(res.status, 404)
+    })
+  })
+
+  await t.test('Platforms', async t => {
+    await t.test('Darwin', async t => {
+      let res = await fetch(`${address}/dat-land/dat-desktop/darwin/1.0.0`)
+      t.equal(res.status, 200)
+      let body = await res.json()
+      t.match(body.url, /-mac\.zip$/)
+
+      res = await fetch(`${address}/webtorrent/webtorrent-desktop/darwin/0.0.0`)
+      t.equal(res.status, 200)
+      body = await res.json()
+      t.match(body.url, /-darwin\.zip$/)
+    })
+  })
 
   server.close()
 })