rename user directory to directory server

src/test/directoryserver-test.js

@@ -9,12 +9,12 @@
 const async = require('async'),
     common = require('./common.js'),
     constants = require('../constants.js'),
+    directoryServer = require('../directoryserver.js'),
     expect = require('expect.js'),
     groups = require('../groups.js'),
     ldap = require('ldapjs'),
     safe = require('safetydance'),
-    settings = require('../settings.js'),
-    userdirectory = require('../userdirectory.js');
+    settings = require('../settings.js');
 
 async function ldapBind(dn, password) {
     return new Promise((resolve, reject) => {
@@ -80,8 +80,8 @@ describe('User Directory Ldap', function () {
     before(function (done) {
         async.series([
             setup,
-            userdirectory.start.bind(null),
-            settings.setUserDirectoryConfig.bind(null, { enabled: true, secret: auth.secret, allowlist: '127.0.0.1' }),
+            directoryServer.start.bind(null),
+            settings.setDirectoryServerConfig.bind(null, { enabled: true, secret: auth.secret, allowlist: '127.0.0.1' }),
             async () => {
                 group = await groups.add({ name: 'ldap-test-1' });
                 await groups.setMembers(group.id, [ admin.id, user.id ]);
@@ -95,7 +95,7 @@ describe('User Directory Ldap', function () {
 
     after(function (done) {
         async.series([
-            userdirectory.stop,
+            directoryServer.stop,
             cleanup
         ], done);
     });