chore(xo-server-test): cleanup and rewrite user tests (#8048)

CHANGELOG.unreleased.md

@@ -52,6 +52,7 @@
 - xo-server minor
 - xo-server-audit patch
 - xo-server-netbox patch
+- xo-server-test patch
 - xo-web minor
 
 <!--packages-end-->

packages/xo-server-test/src/_config.js → packages/xo-server-test/_config.mjs

@@ -1,13 +1,12 @@
 import appConf from 'app-conf'
 import path from 'path'
-
-/* eslint-env jest */
+import { before } from 'node:test'
 
 let config
 export { config as default }
 
-beforeAll(async () => {
+before(async () => {
   config = await appConf.load('xo-server-test', {
-    appDir: path.join(__dirname, '..'),
+    appDir: path.join(process.cwd(), '..'),
   })
 })

packages/xo-server-test/src/_xoConnection.js → packages/xo-server-test/_xoConnection.mjs

@@ -1,16 +1,21 @@
 /* eslint-env jest */
 import Xo from 'xo-lib'
 import { Collection as XoCollection } from 'xo-collection'
-import { decorateWith } from '@vates/decorate-with'
-import { defaultsDeep, find, forOwn, iteratee, pick } from 'lodash'
+import { decorateClass } from '@vates/decorate-with'
+import defaultsDeep from 'lodash/defaultsDeep.js'
+import find from 'lodash/find.js'
+import forOwn from 'lodash/forOwn.js'
+import iteratee from 'lodash/iteratee.js'
+import pick from 'lodash/pick.js'
 import { defer } from 'golike-defer'
 import { fromEvent } from 'promise-toolbox'
-import { parseDuration } from '@vates/parse-duration'
+// import { parseDuration } from '@vates/parse-duration'
+// import {before, after, afterEach} from 'node:test'
 
-import config from './_config'
-import { getDefaultName } from './_defaultValues'
+import config from './_config.mjs'
+import { getDefaultName } from './_defaultValues.mjs'
 
-class XoConnection extends Xo {
+export class XoConnection extends Xo.default {
   constructor(opts) {
     super(opts)
 
@@ -69,7 +74,6 @@ class XoConnection extends Xo {
     return this.waitObject(id)
   }
 
-  @decorateWith(defer)
   async connect($defer, credentials = pick(config.xoConnection, 'email', 'password')) {
     await this.open()
     $defer.onFailure(() => this.close())
@@ -108,6 +112,7 @@ class XoConnection extends Xo {
   }
 
   async createTempResourceSet(params) {
+    const xo = this // getConnection();
     const { id } = await xo.call('resourceSet.create', params)
     this._tempResourceDisposers.push('resourceSet.delete', { id })
     return id
@@ -221,6 +226,7 @@ class XoConnection extends Xo {
   }
 
   async runBackupJob(jobId, scheduleId, { remotes, nExecutions = 1 }) {
+    const xo = this // getConnection();
     for (let i = 0; i < nExecutions; i++) {
       await xo.call('backupNg.runJob', { id: jobId, schedule: scheduleId })
     }
@@ -287,23 +293,27 @@ const getConnection = credentials => {
   return xo.connect(credentials)
 }
 
-let xo
-beforeAll(async () => {
+/*
+before(async () => {
+  console.log('before xoconnection')
+  xo = new XoConnection({ url: config.xoConnection.url })
+  console.log('set')
   // TOFIX: stop tests if the connection is not established properly and show the error
-  xo = await getConnection()
+  await getConnection()
+  console.log('connected')
 })
-afterAll(async () => {
+after(async () => {
+  console.log('after xoconnection')
   await xo.deleteDurableResources()
   await xo.close()
-  xo = null
 })
 afterEach(async () => {
+  console.log('afterEach xoconnection')
   jest.setTimeout(parseDuration(config.deleteTempResourcesTimeout))
 
   await xo.deleteTempResources()
 })
-
-export { xo as default }
+*/
 
 export const testConnection = ({ credentials }) => getConnection(credentials).then(connection => connection.close())
 
@@ -312,3 +322,7 @@ export const testWithOtherConnection = defer(async ($defer, credentials, functio
   $defer(() => xoUser.close())
   await functionToExecute(xoUser)
 })
+
+decorateClass(XoConnection, {
+  connect: defer,
+})

packages/xo-server-test/connect.mjs

@@ -0,0 +1,20 @@
+import Xo from 'xo-lib'
+const XoConnection = Xo.default
+
+const SERVER_URL = process.env.SERVER_URL || 'http://127.0.0.1:80'
+
+/**
+ * @param params Contains {url, email, password} as the optionnal server url, and the email/password of the user
+ * @return Xo A Xo object connection
+ **/
+export async function connect({ url = SERVER_URL, email, password }) {
+  const xo = new XoConnection({ url })
+  await xo.open()
+  try {
+    await xo.signIn({ email, password })
+  } catch (err) {
+    xo.close()
+    throw err
+  }
+  return xo
+}

packages/xo-server-test/index.js

@@ -0,0 +1,2 @@
+// @TODO
+// Index.js will be the main entry point as defined in package.json

packages/xo-server-test/src/backupNg/backupNg.spec.js → packages/xo-server-test/old-tests/backupNg/backupNg.test.mjs

@@ -1,12 +1,15 @@
-/* eslint-env jest */
+// 'use strict'
 
+/*
 import forOwn from 'lodash/forOwn.js'
-import { noSuchObject } from 'xo-common/api-errors'
+import { noSuchObject } from 'xo-common/api-errors.js'
 
-import config from '../_config'
-import randomId from '../_randomId'
-import xo from '../_xoConnection'
-import { getDefaultName, getDefaultSchedule } from '../_defaultValues'
+import config from '../_config.js'
+import randomId from '../_randomId.js'
+import xo from '../_xoConnection.js'
+import { getDefaultName, getDefaultSchedule } from '../_defaultValues.js'
+
+import assert from 'node:assert'
 
 const validateBackupJob = (jobInput, jobOutput, createdSchedule) => {
   const expectedObj = {
@@ -24,7 +27,7 @@ const validateBackupJob = (jobInput, jobOutput, createdSchedule) => {
   const schedules = jobInput.schedules
   if (schedules !== undefined) {
     const scheduleTmpId = Object.keys(schedules)[0]
-    expect(createdSchedule).toEqual({
+    assert.deepEqual(createdSchedule, {
       ...schedules[scheduleTmpId],
       enabled: false,
       id: expect.any(String),
@@ -567,3 +570,4 @@ describe('backupNg', () => {
     })
   }, 200e3)
 })
+*/

packages/xo-server-test/src/old-tests/disk.spec.js → packages/xo-server-test/old-tests/disk.spec.mjs

@@ -1,12 +1,13 @@
 /* eslint-env jest */
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 
 // ===================================================================
 
 import fromEvent from 'promise-toolbox/fromEvent'
-import { getConfig, getMainConnection, getSrId, waitObjectState } from './util'
+import { getConfig, getMainConnection, getSrId, waitObjectState } from '../util.mjs'
 import map from 'lodash/map.js'
 
 // ===================================================================

packages/xo-server-test/src/old-tests/group.spec.js → packages/xo-server-test/old-tests/group.spec.mjs

@@ -2,6 +2,7 @@
 
 import { find, map } from 'lodash'
 
+// eslint-disable-next-line n/no-missing-import
 import { createUser, deleteUsers, getUser, xo } from './util.js'
 
 // ===================================================================

packages/xo-server-test/src/old-tests/host.spec.js → packages/xo-server-test/old-tests/host.spec.mjs

@@ -2,8 +2,10 @@
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
 
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 import fromEvent from 'promise-toolbox/fromEvent'
+// eslint-disable-next-line n/no-missing-import
 import { getAllHosts, getConfig, getMainConnection, getVmToMigrateId, waitObjectState } from './util'
 import { find, forEach } from 'lodash'
 

packages/xo-server-test/src/issues/index.spec.js → packages/xo-server-test/old-tests/issues/index.spec.mjs

@@ -2,8 +2,8 @@
 
 import { parseDuration } from '@vates/parse-duration'
 
-import config from '../_config'
-import xo from '../_xoConnection'
+import config from '../../_config.mjs'
+import xo from '../../_xoConnection.mjs'
 
 describe('issue', () => {
   test('4507', async () => {

packages/xo-server-test/src/job/job.spec.js → packages/xo-server-test/old-tests/job/job.spec.mjs

@@ -1,9 +1,10 @@
 /* eslint-env jest */
 
-import { difference, keyBy } from 'lodash'
+import config from '../../_config.mjs'
+import { describe, it, afterEach } from 'node:test'
+import { XoConnection as xo, testWithOtherConnection } from '../../_xoConnection.mjs'
 
-import config from '../_config'
-import xo, { testWithOtherConnection } from '../_xoConnection'
+const { difference, keyBy } = 'lodash'
 
 const ADMIN_USER = {
   email: '[email protected]',
@@ -14,33 +15,33 @@ const ADMIN_USER = {
 describe('job', () => {
   let defaultJob
 
-  beforeAll(() => {
-    defaultJob = {
-      name: 'jobTest',
-      timeout: 2000,
-      type: 'call',
-      key: 'snapshot',
-      method: 'vm.snapshot',
-      paramsVector: {
-        type: 'crossProduct',
-        items: [
-          {
-            type: 'set',
-            values: [
-              {
-                id: config.vms.default,
-                name: 'test-snapshot',
-              },
-            ],
-          },
-        ],
-      },
-    }
-  })
+  // beforeAll(() => {
+  //   defaultJob = {
+  //     name: 'jobTest',
+  //     timeout: 2000,
+  //     type: 'call',
+  //     key: 'snapshot',
+  //     method: 'vm.snapshot',
+  //     paramsVector: {
+  //       type: 'crossProduct',
+  //       items: [
+  //         {
+  //           type: 'set',
+  //           values: [
+  //             {
+  //               id: config.vms.default,
+  //               name: 'test-snapshot',
+  //             },
+  //           ],
+  //         },
+  //       ],
+  //     },
+  //   }
+  // })
 
   describe('.create() :', () => {
     it('creates a new job', async () => {
-      jest.setTimeout(6e3)
+      // jest.setTimeout(6e3)
       const userId = await xo.createTempUser(ADMIN_USER)
       const { email, password } = ADMIN_USER
       await testWithOtherConnection({ email, password }, async xo => {
@@ -201,7 +202,7 @@ describe('job', () => {
     })
 
     it('runs a job', async () => {
-      jest.setTimeout(7e4)
+      // jest.setTimeout(7e4)
       await xo.createTempServer(config.servers.default)
       const jobId = await xo.createTempJob(defaultJob)
       const snapshots = xo.objects.all[config.vms.default].snapshots

packages/xo-server-test/src/old-tests/pool.spec.js → packages/xo-server-test/old-tests/pool.spec.mjs

@@ -1,11 +1,13 @@
 /* eslint-env jest */
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 
 // ===================================================================
 
 import fromEvent from 'promise-toolbox/fromEvent'
+// eslint-disable-next-line n/no-missing-import
 import { getConfig, getMainConnection, waitObjectState } from './util'
 import find from 'lodash/find.js'
 

packages/xo-server-test/src/old-tests/role.spec.js → packages/xo-server-test/old-tests/role.spec.mjs

@@ -1,5 +1,6 @@
 /* eslint-env jest */
 
+// eslint-disable-next-line n/no-missing-import
 import { xo } from './util'
 
 // ===================================================================

packages/xo-server-test/src/old-tests/schedule.spec.js → packages/xo-server-test/old-tests/schedule.spec.mjs

@@ -1,11 +1,13 @@
 /* eslint-env jest */
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 
 // ===================================================================
 
 import fromEvent from 'promise-toolbox/fromEvent'
+// eslint-disable-next-line n/no-missing-import
 import { getConfig, getMainConnection, getSchedule, jobTest, scheduleTest } from './util'
 import map from 'lodash/map.js'
 

packages/xo-server-test/src/old-tests/scheduler.spec.js → packages/xo-server-test/old-tests/scheduler.spec.mjs

@@ -1,11 +1,13 @@
 /* eslint-env jest */
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 
 // ===================================================================
 
 import fromEvent from 'promise-toolbox/fromEvent'
+// eslint-disable-next-line n/no-missing-import
 import { jobTest, scheduleTest, getConfig, getMainConnection, getSchedule } from './util'
 
 // ===================================================================

packages/xo-server-test/src/old-tests/server.spec.js → packages/xo-server-test/old-tests/server.spec.mjs

@@ -2,6 +2,7 @@
 
 import { find, map } from 'lodash'
 
+// eslint-disable-next-line n/no-missing-import
 import { config, rejectionOf, xo } from './util'
 
 // ===================================================================

packages/xo-server-test/src/old-tests/token.spec.js → packages/xo-server-test/old-tests/token.spec.mjs

@@ -3,7 +3,7 @@
 import { defer } from 'golike-defer'
 import map from 'lodash/map.js'
 
-import { getConnection, rejectionOf, testConnection, xo } from './util.js'
+import { getConnection, rejectionOf, testConnection, xo } from '../util.mjs'
 
 // ===================================================================
 

packages/xo-server-test/src/old-tests/vbd.spec.js → packages/xo-server-test/old-tests/vbd.spec.mjs

@@ -1,11 +1,13 @@
 /* eslint-env jest */
 
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
+// eslint-disable-next-line n/no-missing-import
 import expect from 'must'
 
 // ===================================================================
 
 import fromEvent from 'promise-toolbox/fromEvent'
+// eslint-disable-next-line n/no-missing-import
 import { getConfig, getMainConnection, getVmXoTestPvId, getOneHost, waitObjectState } from './util'
 import map from 'lodash/map.js'