WIP: reorganize and refactor client tests

client/test/api.js

@@ -5,6 +5,18 @@ import { toArray } from 'rxjs/operator/toArray'
 
 import { assertCompletes, removeAllData, compareSetsWithoutVersion } from './utils'
 
+import store from './write/store'
+import insert from './write/insert'
+import upsert from './write/upsert'
+import update from './write/update'
+import replace from './write/replace'
+
+import remove from './write/remove'
+import removeAll from './write/removeAll'
+
+import time from './query/time'
+import user from './query/user'
+
 // This test suite covers various edge cases in the Horizon client library API.
 // It does not cover correctness of the full system in various circumstances.
 // The purpose of the API test suite is to act as a runnable, checkable spec for
@@ -23,45 +35,54 @@ describe('Core API tests', () => {
   const getData = () => data
 
   // Set up the horizon connection before running these tests.
-  before(done => {
+  before(function(done) {
     Horizon.clearAuthTokens()
-    horizon = Horizon({ secure: false, lazyWrites: true })
-    horizon.connect(err => done(err))
-    horizon.onReady(() => {
-      data = horizon('test_data')
+    this.horizon = Horizon({ secure: false, lazyWrites: true })
+    this.horizon.connect(err => done(err))
+    this.horizon.onReady(() => {
+      this.hz_data = this.horizon('test_data')
       done()
     })
   })
 
   // Kill the horizon connection after running these tests.
-  after(done => {
+  after(function(done) {
     let alreadyDone = false
     function wrappedDone(...args) {
       if (!alreadyDone) {
         alreadyDone = true
         return done(...args)
       }
     }
-    horizon.disconnect()
-    horizon.onDisconnected(() => wrappedDone())
+    this.horizon.disconnect()
+    this.horizon.onDisconnected(wrappedDone)
   })
 
   // Test the mutation commands
-  describe('Storage API', () => {
+  describe('Write API', () => {
     // Drop all data after each test
-    afterEach(done => removeAllData(data, done))
-
-    describe('Testing `store`', storeSuite(getData))
-    describe('Testing `insert`', insertSuite(getData))
-    describe('Testing `upsert`', upsertSuite(getData))
-    describe('Testing `update`', updateSuite(getData))
-    describe('Testing `replace`', replaceSuite(getData))
-  }) // Storage API
-  describe('Testing `remove`', removeSuite(getData))
-  describe('Testing `removeAll`', removeAllSuite(getData))
-
-  describe('Testing `times`', timesSuite(getData))
-  describe('Testing authentication', authSuite(getHorizon))
+    afterEach(function(done) {
+      removeAllData(this.hz_data, done)
+    })
+
+    describe('Testing `store`', store)
+    describe('Testing `insert`', insert)
+    describe('Testing `upsert`', upsert)
+    describe('Testing `update`', update)
+    describe('Testing `replace`', replace)
+  })
+
+
+  describe('Remove API', () => {
+    describe('Testing `remove`', remove)
+    describe('Testing `removeAll`', removeAll)
+  })
+
+  describe('Query API', () => {
+    describe('Testing `date and time`', time)
+    describe('Testing `user`', user)
+  })
+
   // Test the lookup API
   describe('Lookup API', () => {
     const testData = [

client/test/times.js → client/test/query/time.js

@@ -1,13 +1,13 @@
 import { _do as tap } from 'rxjs/operator/do'
 import { toArray } from 'rxjs/operator/toArray'
 
-import { assertCompletes, compareWithoutVersion } from './utils'
+import { assertCompletes, compareWithoutVersion } from '../utils'
 
-const timesSuite = global.timesSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   let range = count => Array.from(Array(count).keys())

client/test/auth.js → client/test/query/user.js

@@ -2,11 +2,13 @@ import { _do as tap } from 'rxjs/operator/do'
 import { mergeMap } from 'rxjs/operator/mergeMap'
 import { mergeMapTo } from 'rxjs/operator/mergeMapTo'
 
-const authSuite = global.authSuite = (getHorizon) => () => {
+export default function() {
   let horizon
-  before(() => {
-    horizon = getHorizon()
+
+  before(function() {
+    horizon = this.horizon
   })
+
   it('gets an empty object when unauthenticated', done => {
     horizon.currentUser().fetch().subscribe({
       next(user) {

client/test/test.js

@@ -66,22 +66,6 @@ require('./utils')
 // Testing the Horizon object
 require('./horizonObject.js')
 
-// Testing insertion/storage commands
-require('./store.js')
-require('./insert.js')
-require('./upsert.js')
-require('./update.js')
-require('./replace.js')
-
-// Test the removal commands
-require('./remove.js')
-require('./removeAll.js')
-
-// Times tests
-require('./times.js')
-// Authentication tests
-require('./auth.js')
-
 // Read API
 require('./collection.js')
 require('./find.js')

client/test/insert.js → client/test/write/insert.js

@@ -7,13 +7,13 @@ import { assertCompletes,
          assertThrows,
          assertErrors,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const insertSuite = global.insertSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   // The `insert` command stores documents in the database, and errors if
@@ -147,4 +147,4 @@ const insertSuite = global.insertSuite = getData => () => {
         assert.lengthOf(res, 0)
       })
   ))
-} // Testing `insert`
+}

client/test/remove.js → client/test/write/remove.js

@@ -10,10 +10,11 @@ import { assertCompletes,
          assertErrors,
          removeAllData,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const removeSuite = global.removeSuite = getData => () => {
+export default function() {
   let data
+
   const testData = [
     { id: 1, a: 1 },
     { id: 2, a: 2 },
@@ -22,13 +23,8 @@ const removeSuite = global.removeSuite = getData => () => {
     { id: 'do_not_remove_2' },
   ]
 
-  before(() => {
-    data = getData()
-  })
-
-  // Drop all the existing data
-  before(done => {
-    removeAllData(data, done)
+  before(function() {
+    data = this.hz_data
   })
 
   // Insert the test data and make sure it's in

client/test/removeAll.js → client/test/write/removeAll.js

@@ -10,34 +10,29 @@ import { assertCompletes,
          assertErrors,
          removeAllData,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const removeAllSuite = global.removeAllSuite = getData => () => {
+export default function() {
   let data
+
   const testData = [
     { id: 1, a: 1 },
     { id: 2, a: 2 },
     { id: 3, a: 3 },
-    { id: 4, a: 4 },
     { id: 'do_not_remove_1' },
     { id: 'do_not_remove_2' },
   ]
 
-  before(() => {
-    data = getData()
-  })
-
-  // Drop all the existing data
-  before(done => {
-    removeAllData(data, done)
+  before(function() {
+    data = this.hz_data
   })
 
   // Insert the test data and make sure it's in
   before(assertCompletes(() =>
     data.store(testData)::ignoreElements()
-     ::concat(data.fetch())
-     // Make sure it's there
-     ::tap(res => compareSetsWithoutVersion(res, testData))
+      ::concat(data.fetch())
+      // Make sure it's there
+      ::tap(res => compareSetsWithoutVersion(res, testData))
   ))
 
   // All right, let's remove a document. The promise resolves with no

client/test/replace.js → client/test/write/replace.js

@@ -6,13 +6,13 @@ import { assertCompletes,
          assertThrows,
          assertErrors,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const replaceSuite = global.replaceSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   // Let's store a document first, then replace it.

client/test/store.js → client/test/write/store.js

@@ -7,13 +7,13 @@ import { assertCompletes,
          assertThrows,
          assertErrors,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const storeSuite = global.storeSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   // The `store` command stores documents in the database, and overwrites
@@ -139,4 +139,4 @@ const storeSuite = global.storeSuite = getData => () => {
       ::mergeMap(id => data.find(id[0]).fetch())
       ::tap(result => assert.deepEqual(originalDate, result.date))
   }))
-} // Testing `store`
+}

client/test/update.js → client/test/write/update.js

@@ -7,13 +7,13 @@ import { assertCompletes,
          assertThrows,
          assertErrors,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const updateSuite = global.updateSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   // Let's store a document first, then update it.

client/test/upsert.js → client/test/write/upsert.js

@@ -7,13 +7,13 @@ import { assertCompletes,
          assertThrows,
          assertErrors,
          compareWithoutVersion,
-         compareSetsWithoutVersion } from './utils'
+         compareSetsWithoutVersion } from '../utils'
 
-const upsertSuite = global.upsertSuite = getData => () => {
+export default function() {
   let data
 
-  before(() => {
-    data = getData()
+  before(function() {
+    data = this.hz_data
   })
 
   // The `upsert` command stores documents in the database, and updates