Improve asynchronous behavior of page tests

The changes in this commit focus on improving the asynchronous behavior of the page tests. The main changes are:

- Refactor the tests to use `async/await` syntax for better readability and error handling.
- Add `return new Promise` blocks to ensure the tests wait for callbacks to complete.

Author: paul90

test/page.js

@@ -19,61 +19,72 @@ console.log('testid', testid)
 
 describe('page', () => {
   describe('#page.put()', () => {
-    it('should save a page', () => {
-      page.put('asdf', testpage, e => {
-        if (e) throw e
+    it('should save a page', async () => {
+      return new Promise(resolve => {
+        page.put('asdf', testpage, e => {
+          if (e) throw e
+          resolve()
+        })
       })
     })
   })
   describe('#page.get()', () => {
-    it('should get a page if it exists', () => {
-      page.get('asdf', (e, got) => {
-        if (e) throw e
-        assert.equal(got.title, 'Asdf')
+    it('should get a page if it exists', async () => {
+      return new Promise(resolve => {
+        page.get('asdf', (e, got) => {
+          if (e) throw e
+          assert.equal(got.title, 'Asdf')
+          resolve()
+        })
       })
     })
-    it('should copy a page from default if nonexistant in db', () => {
-      page.get('welcome-visitors', (e, got) => {
-        if (e) throw e
-        assert.equal(got.title, 'Welcome Visitors')
+    it('should copy a page from default if nonexistant in db', async () => {
+      return new Promise(resolve => {
+        page.get('welcome-visitors', (e, got) => {
+          if (e) throw e
+          assert.equal(got.title, 'Welcome Visitors')
+          resolve()
+        })
       })
     })
     // note: here we assume the wiki-plugin-activity repo has been cloned into an adjacent directory
-    it('should copy a page from plugins if nonexistant in db', () => {
-      page.get('recent-changes', (e, got) => {
-        if (e) throw e
-        assert.equal(got.title, 'Recent Changes')
+    it('should copy a page from plugins if nonexistant in db', async () => {
+      return new Promise(resolve => {
+        page.get('recent-changes', (e, got) => {
+          if (e) throw e
+          assert.equal(got.title, 'Recent Changes')
+          resolve()
+        })
       })
     })
     // note: here we assume the wiki-plugin-activity repo has been cloned into an adjacent directory
-    it('should mark a page from plugins with the plugin name', () => {
-      page.get('recent-changes', (e, got) => {
-        if (e) throw e
-        assert.equal(got.plugin, 'activity')
+    it('should mark a page from plugins with the plugin name', async () => {
+      return new Promise(resolve => {
+        page.get('recent-changes', (e, got) => {
+          if (e) throw e
+          assert.equal(got.plugin, 'activity')
+          resolve()
+        })
       })
     })
-    it('should create a page if it exists nowhere', () => {
-      page.get(random(), (e, got) => {
-        if (e) throw e
-        assert.equal(got, 'Page not found')
+    it('should create a page if it exists nowhere', async () => {
+      return new Promise(resolve => {
+        page.get(random(), (e, got) => {
+          if (e) throw e
+          assert.equal(got, 'Page not found')
+          resolve()
+        })
       })
     })
-    it.skip('should eventually write the page to disk', async () => {
-      const test = () => {
-        console.log('should write', argv)
-        fs.readFile(path.join(argv.db, 'asdf'), (err, data) => {
-          if (err) throw err
-          const readPage = JSON.parse(data)
-          page.get('asdf', (e, got) => {
-            assert.equal(readPage.title, got.title)
-          })
+    it('should eventually write the page to disk', async () => {
+      return new Promise(resolve => {
+        page.get('asdf', (e, got) => {
+          if (e) throw e
+          const page = JSON.parse(fs.readFileSync(path.join(path.sep, 'tmp', 'sfwtests', testid, 'pages', 'asdf')))
+          assert.equal(got.title, page.title)
+          resolve()
         })
-      }
-      if (page.isWorking()) {
-        page.on('finished', () => test())
-      } else {
-        test()
-      }
+      })
     })
   })
 })

test/server.js

@@ -15,7 +15,7 @@ const argv = require('../lib/defaultargs')({
   test: true,
 })
 
-describe('server', d => {
+describe('server', () => {
   var app = {}
   let runningServer = null
   before(done => {
@@ -90,9 +90,9 @@ describe('server', d => {
       .then(
         () => {
           const page = JSON.parse(fs.readFileSync(loc))
-          assert(page.story[1].id, 'a3')
-          assert(page.story[2].id, 'a2')
-          assert(page.journal[1].type, 'move')
+          assert.equal(page.story[1].id, 'a3')
+          assert.equal(page.story[2].id, 'a2')
+          assert.equal(page.journal[1].type, 'move')
         },
         err => {
           throw err
@@ -137,7 +137,7 @@ describe('server', d => {
       .expect(200)
       .then(() => {
         const page = JSON.parse(fs.readFileSync(loc))
-        assert(page.story.length == 4)
+        assert.equal(page.story.length, 4)
         assert.equal(page.story[1].id, 'a3')
         assert.notEqual(page.story[2].id, 'a2')
         assert.equal(page.story[2].id, 'a5')
@@ -180,8 +180,8 @@ describe('server', d => {
       .expect(500)
       .then(() => {
         const page = JSON.parse(fs.readFileSync(loc))
-        assert(page.story.length == 4)
-        assert(page.journal.length == 5)
+        assert.equal(page.story.length, 4)
+        assert.equal(page.journal.length, 5)
         assert.equal(page.story[0].id, 'a1')
         assert.equal(page.story[3].text, 'this is the fourth paragraph')
         assert.equal(page.journal[4].type, 'edit')
@@ -217,7 +217,7 @@ describe('server', d => {
       .expect(200)
       .expect('Content-Type', /json/)
       .then(res => {
-        assert(res.body.length == 1)
+        assert.equal(res.body.length, 1)
         assert.equal(res.body[0], 'adsf-test-page')
       })
       .catch(err => {