BC-5639 - fix some tests

src/services/link/index.js

@@ -27,7 +27,8 @@ module.exports = function setup() {
 	function redirectToTarget(req, res, next) {
 		if (req.method === 'GET' && !req.query.target) {
 			// capture these requests and issue a redirect
-			const linkId = req.params.__feathersId;
+			// const linkId = req.params.__feathersId;
+			const linkId = req.lookup.params.__id;
 			linkService
 				.get(linkId)
 				.then((data) => {
@@ -137,7 +138,7 @@ module.exports = function setup() {
 				const { teamId } = data;
 
 				if (email) {
-					const { data: userData } = await app.service('users').find({ query: { email: email } });
+					const { data: userData } = await app.service('users').find({ query: { email } });
 					if (userData && userData[0] && userData[0].importHash) {
 						linkInfo.hash = userData[0].importHash;
 					} else {

src/services/school/index.js

@@ -15,19 +15,19 @@ module.exports = function schoolServices() {
 	const app = this;
 
 	app.use('/schools/api', staticContent(path.join(__dirname, '/docs/openapi.yaml')));
-
-	const options = {
-		Model: schoolModels.schoolModel,
-		paginate: {
-			default: 5,
-			max: 100, // this is the max currently used in the SHD
-		},
-		lean: {
-			virtuals: true,
-		},
-	};
-
-	app.use('/schools', service(options));
+	app.use(
+		'/schools',
+		service({
+			Model: schoolModels.schoolModel,
+			paginate: {
+				default: 5,
+				max: 100, // this is the max currently used in the SHD
+			},
+			lean: {
+				virtuals: true,
+			},
+		})
+	);
 	const schoolService = app.service('/schools');
 	schoolService.hooks(hooks);
 

test/services/account/services/jwtTimerService.test.js

@@ -45,6 +45,7 @@ describe('jwtTimer service', () => {
 				/* eslint-disable global-require */
 				redisHelper = require('../../../../src/utils/redis');
 				const { jwtTimerServiceSetup } = require('../../../../src/services/account/services/jwtTimerService');
+				app.unuse('/accounts/jwtTimer');
 				app.configure(jwtTimerServiceSetup);
 				/* eslint-enable global-require */
 
@@ -105,6 +106,7 @@ describe('jwtTimer service', () => {
 				/* eslint-disable global-require */
 				redisHelper = require('../../../../src/utils/redis');
 				const { jwtTimerServiceSetup } = require('../../../../src/services/account/services/jwtTimerService');
+				app.unuse('/accounts/jwtTimer');
 				app.configure(jwtTimerServiceSetup);
 				/* eslint-enable global-require */
 

test/services/content/material.test.js

@@ -14,8 +14,8 @@ describe('material service', () => {
 
 	before(async () => {
 		app = await appPromise();
-		server = await app.listen(0);
 		nestServices = await setupNestServices(app);
+		server = await app.listen(0);
 	});
 
 	after(async () => {
@@ -41,10 +41,6 @@ describe('material service', () => {
 		let materialA;
 		let materialB;
 
-		before((done) => {
-			server = app.listen(0, done);
-		});
-
 		before(async () => {
 			[materialA, materialB] = await Promise.all([
 				Material.create({

test/services/datasources/datasourceRuns.test.js

@@ -53,6 +53,9 @@ describe('datasourceRuns service', () => {
 		});
 		mockery.registerMock('./strategies', [MockSyncer, MockSyncerWithData]);
 		datasourceRunsService = app.service('datasourceRuns');
+
+		app.unuse('/sync/userAccount');
+		app.unuse('/sync');
 		// eslint-disable-next-line global-require
 		const sync = require('../../../src/services/sync');
 		app.configure(sync);

test/services/helpdesk/index.test.js

@@ -2,8 +2,8 @@
 const assert = require('assert');
 const { expect } = require('chai');
 const sinon = require('sinon');
-const appPromise = require('../../../src/app');
 const { Configuration } = require('@hpi-schul-cloud/commons');
+const appPromise = require('../../../src/app');
 
 describe('helpdesk service', function test() {
 	this.timeout(10000);
@@ -36,6 +36,7 @@ describe('helpdesk service', function test() {
 	});
 
 	after((done) => {
+		app.unuse('/mails');
 		app.use('/mails', originalMailService);
 		helpdeskService
 			.remove(testProblem)
@@ -115,6 +116,7 @@ describe('helpdesk service', function test() {
 			problemDescription: 'Dies ist die Problembeschreibung 1',
 			replyEmail: '[email protected]',
 		};
+		app.unuse('/mails');
 		const mailService = new MockMailService();
 		app.use('/mails', mailService);
 		await helpdeskService.create(postBody, { account: { userId: '0000d213816abba584714c0a' } });
@@ -129,6 +131,7 @@ describe('helpdesk service', function test() {
 			problemDescription: 'Dies ist die Problembeschreibung 1',
 			replyEmail: '[email protected]',
 		};
+		app.unuse('/mails');
 		const mailService = new MockMailService();
 		app.use('/mails', mailService);
 		const tempScTheme = Configuration.get('SUPPORT_PROBLEM_EMAIL_ADDRESS');
@@ -146,6 +149,7 @@ describe('helpdesk service', function test() {
 			problemDescription: 'Dies ist die Problembeschreibung 1',
 			replyEmail: '[email protected]',
 		};
+		app.unuse('/mails');
 		const mailService = new MockMailService();
 		app.use('/mails', mailService);
 		await helpdeskService.create(postBody, { account: { userId: '0000d213816abba584714c0a' } });
@@ -161,6 +165,7 @@ describe('helpdesk service', function test() {
 			problemDescription: 'Dies ist die Problembeschreibung 2',
 			replyEmail: '[email protected]',
 		};
+		app.unuse('/mails');
 		const mailService = new MockMailService();
 		app.use('/mails', mailService);
 		const tempScTheme = Configuration.get('SUPPORT_WISH_EMAIL_ADDRESS');

test/services/ldap-config/service.integration.test.js

@@ -150,25 +150,28 @@ describe('LdapConfigService', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				getUsers: sinon.fake.resolves(fakeUsers),
 				getClasses: sinon.fake.resolves(fakeClasses),
 				disconnect: sinon.fake.resolves(),
 			};
 		}
 
-		beforeEach(() => {
-			ldapServiceMock = new MockLdapService();
-			app.use('ldap', ldapServiceMock);
-		});
-
 		before(() => {
 			originalLdapService = app.service('ldap');
 		});
 
 		after(() => {
+			app.unuse('ldap');
 			app.use('ldap', originalLdapService);
 		});
 
+		beforeEach(() => {
+			app.unuse('/ldap');
+			ldapServiceMock = new MockLdapService();
+			app.use('ldap', ldapServiceMock);
+		});
+
 		beforeEach(async () => {
 			school = await testObjects.createTestSchool({
 				systems: [],
@@ -223,6 +226,7 @@ describe('LdapConfigService', () => {
 		});
 
 		it('should catch common errors', async () => {
+			app.unuse('ldap');
 			ldapServiceMock.getUsers = sinon.fake.rejects(new LDAPConnectionError());
 			app.use('ldap', ldapServiceMock);
 
@@ -287,25 +291,28 @@ describe('LdapConfigService', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				getUsers: sinon.fake.resolves(fakeUsers),
 				getClasses: sinon.fake.resolves(fakeClasses),
 				disconnect: sinon.fake.resolves(),
 			};
 		}
 
-		beforeEach(() => {
-			ldapServiceMock = new MockLdapService();
-			app.use('ldap', ldapServiceMock);
-		});
-
 		before(() => {
 			originalLdapService = app.service('ldap');
 		});
 
 		after(() => {
+			app.unuse('ldap');
 			app.use('ldap', originalLdapService);
 		});
 
+		beforeEach(() => {
+			app.unuse('/ldap');
+			ldapServiceMock = new MockLdapService();
+			app.use('/ldap', ldapServiceMock);
+		});
+
 		beforeEach(async () => {
 			system = await testObjects.createTestSystem({
 				type: 'ldap',

test/services/ldap/strategies/general.test.js

@@ -66,6 +66,7 @@ describe('GeneralLDAPStrategy', () => {
 	});
 
 	after(() => {
+		app.unuse('/ldap');
 		app.use('/ldap', originalLdapService);
 	});
 

test/services/ldap/strategies/iserv-idm.test.js

@@ -22,13 +22,15 @@ describe('IservIdmLDAPStrategy', () => {
 	});
 
 	after(() => {
+		app.unuse('/ldap');
 		app.use('/ldap', originalLdapService);
 	});
 
 	describe('#getSchools', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.returns([
 					{ dn: 'o=Testschule,dc=de', o: 'Testschule' },
 					{ dn: 'o=hvk,dc=schule', description: 'Heinrich-von-Kleist-Schule', o: 'hvk' },
@@ -37,6 +39,7 @@ describe('IservIdmLDAPStrategy', () => {
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});
@@ -86,6 +89,7 @@ describe('IservIdmLDAPStrategy', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.returns([
 					{
 						dn: 'cn=student1,ou=users,o=Testschule,dc=de',
@@ -153,6 +157,7 @@ describe('IservIdmLDAPStrategy', () => {
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});
@@ -206,6 +211,7 @@ describe('IservIdmLDAPStrategy', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.returns([
 					{
 						dn: 'cn=klasse9a,ou=groups,o=Testschule,dc=de',
@@ -228,6 +234,7 @@ describe('IservIdmLDAPStrategy', () => {
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});

test/services/ldap/strategies/univention.test.js

@@ -27,6 +27,7 @@ describe('UniventionLDAPStrategy', () => {
 	});
 
 	after(() => {
+		app.unuse('/ldap');
 		app.use('/ldap', originalLdapService);
 	});
 
@@ -39,11 +40,13 @@ describe('UniventionLDAPStrategy', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.resolves(ldapFakeSchoolSearchResult),
 			};
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});
@@ -122,6 +125,7 @@ describe('UniventionLDAPStrategy', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.resolves([
 					{
 						dn: 'uid=max1,cn=schueler,cn=users,ou=1,dc=training,dc=ucs',
@@ -165,6 +169,7 @@ describe('UniventionLDAPStrategy', () => {
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});
@@ -241,11 +246,13 @@ describe('UniventionLDAPStrategy', () => {
 		function MockLdapService() {
 			return {
 				setup: () => {},
+				get: () => {},
 				searchCollection: sinon.fake.resolves(ldapFakeClassSearchResult),
 			};
 		}
 
 		beforeEach(() => {
+			app.unuse('/ldap');
 			ldapServiceMock = new MockLdapService();
 			app.use('/ldap', ldapServiceMock);
 		});

test/services/news/index.test.js

@@ -4,18 +4,22 @@ const sleep = require('util').promisify(setTimeout);
 
 const appPromise = require('../../../src/app');
 const { newsModel: News } = require('../../../src/services/news/model');
+const { setupNestServices, closeNestServices } = require('../../utils/setup.nest.services');
 
 describe('news service', () => {
 	let app;
-	let newsService;
+	let server;
+	let nestServices;
 
 	before(async () => {
 		app = await appPromise();
-		newsService = app.service('news');
+		nestServices = await setupNestServices(app);
+		server = await app.listen(0);
 	});
 
-	it('public service has been disabled', () => {
-		expect(newsService, 'use v3 instead').to.equal(undefined);
+	after(async () => {
+		await server.close();
+		await closeNestServices(nestServices);
 	});
 
 	describe('event handlers', () => {