1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00

Server: Fixed tests and clean up

This commit is contained in:
Laurent Cozic 2021-01-15 22:02:36 +00:00
parent 7fd4c28a5b
commit eb3493f648
4 changed files with 27 additions and 57 deletions

View File

@ -1479,30 +1479,6 @@ packages/server/src/config-tests.js.map
packages/server/src/config.d.ts packages/server/src/config.d.ts
packages/server/src/config.js packages/server/src/config.js
packages/server/src/config.js.map packages/server/src/config.js.map
packages/server/src/controllers/BaseController.d.ts
packages/server/src/controllers/BaseController.js
packages/server/src/controllers/BaseController.js.map
packages/server/src/controllers/api/OAuthController.d.ts
packages/server/src/controllers/api/OAuthController.js
packages/server/src/controllers/api/OAuthController.js.map
packages/server/src/controllers/factory.d.ts
packages/server/src/controllers/factory.js
packages/server/src/controllers/factory.js.map
packages/server/src/controllers/index/FileController.d.ts
packages/server/src/controllers/index/FileController.js
packages/server/src/controllers/index/FileController.js.map
packages/server/src/controllers/index/HomeController.d.ts
packages/server/src/controllers/index/HomeController.js
packages/server/src/controllers/index/HomeController.js.map
packages/server/src/controllers/index/LoginController.d.ts
packages/server/src/controllers/index/LoginController.js
packages/server/src/controllers/index/LoginController.js.map
packages/server/src/controllers/index/NotificationController.d.ts
packages/server/src/controllers/index/NotificationController.js
packages/server/src/controllers/index/NotificationController.js.map
packages/server/src/controllers/index/UserController.d.ts
packages/server/src/controllers/index/UserController.js
packages/server/src/controllers/index/UserController.js.map
packages/server/src/db.d.ts packages/server/src/db.d.ts
packages/server/src/db.js packages/server/src/db.js
packages/server/src/db.js.map packages/server/src/db.js.map
@ -1578,9 +1554,6 @@ packages/server/src/routes/api/files.js.map
packages/server/src/routes/api/files.test.d.ts packages/server/src/routes/api/files.test.d.ts
packages/server/src/routes/api/files.test.js packages/server/src/routes/api/files.test.js
packages/server/src/routes/api/files.test.js.map packages/server/src/routes/api/files.test.js.map
packages/server/src/routes/api/index.d.ts
packages/server/src/routes/api/index.js
packages/server/src/routes/api/index.js.map
packages/server/src/routes/api/ping.d.ts packages/server/src/routes/api/ping.d.ts
packages/server/src/routes/api/ping.js packages/server/src/routes/api/ping.js
packages/server/src/routes/api/ping.js.map packages/server/src/routes/api/ping.js.map
@ -1602,6 +1575,9 @@ packages/server/src/routes/index/files.js.map
packages/server/src/routes/index/home.d.ts packages/server/src/routes/index/home.d.ts
packages/server/src/routes/index/home.js packages/server/src/routes/index/home.js
packages/server/src/routes/index/home.js.map packages/server/src/routes/index/home.js.map
packages/server/src/routes/index/home.test.d.ts
packages/server/src/routes/index/home.test.js
packages/server/src/routes/index/home.test.js.map
packages/server/src/routes/index/login.d.ts packages/server/src/routes/index/login.d.ts
packages/server/src/routes/index/login.js packages/server/src/routes/index/login.js
packages/server/src/routes/index/login.js.map packages/server/src/routes/index/login.js.map
@ -1611,9 +1587,15 @@ packages/server/src/routes/index/login.test.js.map
packages/server/src/routes/index/logout.d.ts packages/server/src/routes/index/logout.d.ts
packages/server/src/routes/index/logout.js packages/server/src/routes/index/logout.js
packages/server/src/routes/index/logout.js.map packages/server/src/routes/index/logout.js.map
packages/server/src/routes/index/logout.test.d.ts
packages/server/src/routes/index/logout.test.js
packages/server/src/routes/index/logout.test.js.map
packages/server/src/routes/index/notifications.d.ts packages/server/src/routes/index/notifications.d.ts
packages/server/src/routes/index/notifications.js packages/server/src/routes/index/notifications.js
packages/server/src/routes/index/notifications.js.map packages/server/src/routes/index/notifications.js.map
packages/server/src/routes/index/notifications.test.d.ts
packages/server/src/routes/index/notifications.test.js
packages/server/src/routes/index/notifications.test.js.map
packages/server/src/routes/index/users.d.ts packages/server/src/routes/index/users.d.ts
packages/server/src/routes/index/users.js packages/server/src/routes/index/users.js
packages/server/src/routes/index/users.js.map packages/server/src/routes/index/users.js.map
@ -1638,6 +1620,9 @@ packages/server/src/tools/dbTools.js.map
packages/server/src/tools/generate-types.d.ts packages/server/src/tools/generate-types.d.ts
packages/server/src/tools/generate-types.js packages/server/src/tools/generate-types.js
packages/server/src/tools/generate-types.js.map packages/server/src/tools/generate-types.js.map
packages/server/src/utils/Router.d.ts
packages/server/src/utils/Router.js
packages/server/src/utils/Router.js.map
packages/server/src/utils/TransactionHandler.d.ts packages/server/src/utils/TransactionHandler.d.ts
packages/server/src/utils/TransactionHandler.js packages/server/src/utils/TransactionHandler.js
packages/server/src/utils/TransactionHandler.js.map packages/server/src/utils/TransactionHandler.js.map

39
.gitignore vendored
View File

@ -1467,30 +1467,6 @@ packages/server/src/config-tests.js.map
packages/server/src/config.d.ts packages/server/src/config.d.ts
packages/server/src/config.js packages/server/src/config.js
packages/server/src/config.js.map packages/server/src/config.js.map
packages/server/src/controllers/BaseController.d.ts
packages/server/src/controllers/BaseController.js
packages/server/src/controllers/BaseController.js.map
packages/server/src/controllers/api/OAuthController.d.ts
packages/server/src/controllers/api/OAuthController.js
packages/server/src/controllers/api/OAuthController.js.map
packages/server/src/controllers/factory.d.ts
packages/server/src/controllers/factory.js
packages/server/src/controllers/factory.js.map
packages/server/src/controllers/index/FileController.d.ts
packages/server/src/controllers/index/FileController.js
packages/server/src/controllers/index/FileController.js.map
packages/server/src/controllers/index/HomeController.d.ts
packages/server/src/controllers/index/HomeController.js
packages/server/src/controllers/index/HomeController.js.map
packages/server/src/controllers/index/LoginController.d.ts
packages/server/src/controllers/index/LoginController.js
packages/server/src/controllers/index/LoginController.js.map
packages/server/src/controllers/index/NotificationController.d.ts
packages/server/src/controllers/index/NotificationController.js
packages/server/src/controllers/index/NotificationController.js.map
packages/server/src/controllers/index/UserController.d.ts
packages/server/src/controllers/index/UserController.js
packages/server/src/controllers/index/UserController.js.map
packages/server/src/db.d.ts packages/server/src/db.d.ts
packages/server/src/db.js packages/server/src/db.js
packages/server/src/db.js.map packages/server/src/db.js.map
@ -1566,9 +1542,6 @@ packages/server/src/routes/api/files.js.map
packages/server/src/routes/api/files.test.d.ts packages/server/src/routes/api/files.test.d.ts
packages/server/src/routes/api/files.test.js packages/server/src/routes/api/files.test.js
packages/server/src/routes/api/files.test.js.map packages/server/src/routes/api/files.test.js.map
packages/server/src/routes/api/index.d.ts
packages/server/src/routes/api/index.js
packages/server/src/routes/api/index.js.map
packages/server/src/routes/api/ping.d.ts packages/server/src/routes/api/ping.d.ts
packages/server/src/routes/api/ping.js packages/server/src/routes/api/ping.js
packages/server/src/routes/api/ping.js.map packages/server/src/routes/api/ping.js.map
@ -1590,6 +1563,9 @@ packages/server/src/routes/index/files.js.map
packages/server/src/routes/index/home.d.ts packages/server/src/routes/index/home.d.ts
packages/server/src/routes/index/home.js packages/server/src/routes/index/home.js
packages/server/src/routes/index/home.js.map packages/server/src/routes/index/home.js.map
packages/server/src/routes/index/home.test.d.ts
packages/server/src/routes/index/home.test.js
packages/server/src/routes/index/home.test.js.map
packages/server/src/routes/index/login.d.ts packages/server/src/routes/index/login.d.ts
packages/server/src/routes/index/login.js packages/server/src/routes/index/login.js
packages/server/src/routes/index/login.js.map packages/server/src/routes/index/login.js.map
@ -1599,9 +1575,15 @@ packages/server/src/routes/index/login.test.js.map
packages/server/src/routes/index/logout.d.ts packages/server/src/routes/index/logout.d.ts
packages/server/src/routes/index/logout.js packages/server/src/routes/index/logout.js
packages/server/src/routes/index/logout.js.map packages/server/src/routes/index/logout.js.map
packages/server/src/routes/index/logout.test.d.ts
packages/server/src/routes/index/logout.test.js
packages/server/src/routes/index/logout.test.js.map
packages/server/src/routes/index/notifications.d.ts packages/server/src/routes/index/notifications.d.ts
packages/server/src/routes/index/notifications.js packages/server/src/routes/index/notifications.js
packages/server/src/routes/index/notifications.js.map packages/server/src/routes/index/notifications.js.map
packages/server/src/routes/index/notifications.test.d.ts
packages/server/src/routes/index/notifications.test.js
packages/server/src/routes/index/notifications.test.js.map
packages/server/src/routes/index/users.d.ts packages/server/src/routes/index/users.d.ts
packages/server/src/routes/index/users.js packages/server/src/routes/index/users.js
packages/server/src/routes/index/users.js.map packages/server/src/routes/index/users.js.map
@ -1626,6 +1608,9 @@ packages/server/src/tools/dbTools.js.map
packages/server/src/tools/generate-types.d.ts packages/server/src/tools/generate-types.d.ts
packages/server/src/tools/generate-types.js packages/server/src/tools/generate-types.js
packages/server/src/tools/generate-types.js.map packages/server/src/tools/generate-types.js.map
packages/server/src/utils/Router.d.ts
packages/server/src/utils/Router.js
packages/server/src/utils/Router.js.map
packages/server/src/utils/TransactionHandler.d.ts packages/server/src/utils/TransactionHandler.d.ts
packages/server/src/utils/TransactionHandler.js packages/server/src/utils/TransactionHandler.js
packages/server/src/utils/TransactionHandler.js.map packages/server/src/utils/TransactionHandler.js.map

View File

@ -586,4 +586,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: a0d1ca4e385ef46f9103f02206ebf612107dd508 PODFILE CHECKSUM: a0d1ca4e385ef46f9103f02206ebf612107dd508
COCOAPODS: 1.9.3 COCOAPODS: 1.10.1

View File

@ -2,10 +2,10 @@ import { createUserAndSession, beforeAllDb, afterAllTests, beforeEachDb, models,
import { File } from '../db'; import { File } from '../db';
import { ErrorForbidden, ErrorUnprocessableEntity } from '../utils/errors'; import { ErrorForbidden, ErrorUnprocessableEntity } from '../utils/errors';
describe('NotificationModel', function() { describe('UserModel', function() {
beforeAll(async () => { beforeAll(async () => {
await beforeAllDb('NotificationModel'); await beforeAllDb('UserModel');
}); });
afterAll(async () => { afterAll(async () => {