test: stop dynamic importing of entities using the glob pattern (part…

…2) (#75)
denolib · Jun 20, 2020 · 27c887b · 27c887b
1 parent 9a9de70
commit 27c887b
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 84 deletions.
diff --git a/...ators/relation-count/relation-count-many-to-many/relation-count-decorator-many-to-many.ts b/...ators/relation-count/relation-count-many-to-many/relation-count-decorator-many-to-many.ts
@@ -1,7 +1,6 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {expect} from "../../../../deps/chai.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/index.ts";
 import {Category} from "./entity/Category.ts";
 import {Post} from "./entity/Post.ts";
@@ -10,9 +9,8 @@ import {Image} from "./entity/Image.ts";
 describe("query builder > relation-count-decorator-many-to-many > many-to-many", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...orators/relation-count/relation-count-one-to-many/relation-count-decorator-one-to-many.ts b/...orators/relation-count/relation-count-one-to-many/relation-count-decorator-one-to-many.ts
@@ -1,7 +1,6 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
 import {expect} from "../../../../deps/chai.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/connection/Connection.ts";
 import {Category} from "./entity/Category.ts";
 import {Post} from "./entity/Post.ts";
@@ -10,9 +9,8 @@ import {Image} from "./entity/Image.ts";
 describe("decorators > relation-count-decorator > one-to-many", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...nal/decorators/relation-id/relation-id-many-to-many/relation-id-decorator-many-to-many.ts b/...nal/decorators/relation-id/relation-id-many-to-many/relation-id-decorator-many-to-many.ts
@@ -1,7 +1,6 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
 import {expect} from "../../../../deps/chai.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/connection/Connection.ts";
 import {Post} from "./entity/Post.ts";
 import {Category} from "./entity/Category.ts";
@@ -10,9 +9,8 @@ import {Image} from "./entity/Image.ts";
 describe("decorators > relation-id-decorator > many-to-many", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ional/decorators/relation-id/relation-id-many-to-one/relation-id-decorator-many-to-one.ts b/...ional/decorators/relation-id/relation-id-many-to-one/relation-id-decorator-many-to-one.ts
@@ -1,17 +1,15 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
 import {expect} from "../../../../deps/chai.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/connection/Connection.ts";
 import {Post} from "./entity/Post.ts";
 import {Category} from "./entity/Category.ts";
 
 describe("decorators > relation-id-decorator > many-to-one", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ional/decorators/relation-id/relation-id-one-to-many/relation-id-decorator-one-to-many.ts b/...ional/decorators/relation-id/relation-id-one-to-many/relation-id-decorator-one-to-many.ts
@@ -1,17 +1,15 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
 import {expect} from "../../../../deps/chai.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/connection/Connection.ts";
 import {Category} from "./entity/Category.ts";
 import {Post} from "./entity/Post.ts";
 
 describe("decorators > relation-id > one-to-many", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ctional/decorators/relation-id/relation-id-one-to-one/relation-id-decorator-one-to-one.ts b/...ctional/decorators/relation-id/relation-id-one-to-one/relation-id-decorator-one-to-one.ts
@@ -1,17 +1,15 @@
-import {join as joinPaths} from "../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../deps/mocha.ts";
 import {expect} from "../../../../deps/chai.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../../utils/test-utils.ts";
 import {Connection} from "../../../../../src/connection/Connection.ts";
 import {Category} from "./entity/Category.ts";
 import {Post} from "./entity/Post.ts";
 
 describe("decorators > relation-id > one-to-one", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/persistence/custom-column-name-pk/custom-column-name-pk.ts b/test/functional/persistence/custom-column-name-pk/custom-column-name-pk.ts
@@ -1,5 +1,4 @@
-import {join as joinPaths} from "../../../../vendor/https/deno.land/std/path/mod.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
 import {Connection} from "../../../../src/connection/Connection.ts";
 import {Post} from "./entity/Post.ts";
 import {Category} from "./entity/Category.ts";
@@ -9,7 +8,6 @@ import "../../../deps/chai.ts";
 describe("persistence > cascade operations with custom name", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
         entities: [Category, Post],
     }));

diff --git a/...nctional/query-builder/relation-id/many-to-one/basic-functionality/basic-functionality.ts b/...nctional/query-builder/relation-id/many-to-one/basic-functionality/basic-functionality.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -16,9 +14,8 @@ import {PostCategory} from "./entity/PostCategory.ts";
 describe("query builder > relation-id > many-to-one > basic-functionality", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post, PostCategory],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ry-builder/relation-id/many-to-one/embedded-with-multiple-pk/embedded-with-multiple-pk.ts b/...ry-builder/relation-id/many-to-one/embedded-with-multiple-pk/embedded-with-multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > many-to-one > embedded-with-multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/many-to-one/embedded/embedded.ts b/test/functional/query-builder/relation-id/many-to-one/embedded/embedded.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > many-to-one > embedded", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/many-to-one/multiple-pk/multiple-pk.ts b/test/functional/query-builder/relation-id/many-to-one/multiple-pk/multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -15,9 +13,8 @@ import {Image} from "./entity/Image.ts";
 describe("query builder > relation-id > many-to-one > multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...nctional/query-builder/relation-id/one-to-many/basic-functionality/basic-functionality.ts b/...nctional/query-builder/relation-id/one-to-many/basic-functionality/basic-functionality.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -15,9 +13,8 @@ import {Image} from "./entity/Image.ts";
 describe("query builder > relation-id > one-to-many > basic-functionality", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ry-builder/relation-id/one-to-many/embedded-with-multiple-pk/embedded-with-multiple-pk.ts b/...ry-builder/relation-id/one-to-many/embedded-with-multiple-pk/embedded-with-multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > one-to-many > embedded-with-multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/one-to-many/embedded/embedded.ts b/test/functional/query-builder/relation-id/one-to-many/embedded/embedded.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > one-to-many > embedded", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/one-to-many/multiple-pk/multiple-pk.ts b/test/functional/query-builder/relation-id/one-to-many/multiple-pk/multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -15,9 +13,8 @@ import {Image} from "./entity/Image.ts";
 describe("query builder > relation-id > one-to-many > multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post]
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...unctional/query-builder/relation-id/one-to-one/basic-functionality/basic-functionality.ts b/...unctional/query-builder/relation-id/one-to-one/basic-functionality/basic-functionality.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -14,9 +12,8 @@ import {Post} from "./entity/Post.ts";
 describe("query builder > relation-id > one-to-one > basic-functionality", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/...ery-builder/relation-id/one-to-one/embedded-with-multiple-pk/embedded-with-multiple-pk.ts b/...ery-builder/relation-id/one-to-one/embedded-with-multiple-pk/embedded-with-multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > one-to-one > embedded-with-multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/one-to-one/embedded/embedded.ts b/test/functional/query-builder/relation-id/one-to-one/embedded/embedded.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -17,9 +15,8 @@ import {Subcounters} from "./entity/Subcounters.ts";
 describe("query builder > relation-id > one-to-one > embedded", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Counters, Post, Subcounters, User],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/functional/query-builder/relation-id/one-to-one/multiple-pk/multiple-pk.ts b/test/functional/query-builder/relation-id/one-to-one/multiple-pk/multiple-pk.ts
@@ -1,8 +1,6 @@
-import {join as joinPaths} from "../../../../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../../../../deps/mocha.ts";
 import {expect} from "../../../../../deps/chai.ts";
 import {
-    getDirnameOfCurrentModule,
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases
@@ -15,9 +13,8 @@ import {Image} from "./entity/Image.ts";
 describe("query builder > relation-id > one-to-one > multiple-pk", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [joinPaths(__dirname, "/entity/*.ts")],
+        entities: [Category, Image, Post],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));

diff --git a/test/github-issues/3551/issue-3551.ts b/test/github-issues/3551/issue-3551.ts
@@ -1,15 +1,13 @@
-import {join as joinPaths} from "../../../vendor/https/deno.land/std/path/mod.ts";
 import {runIfMain} from "../../deps/mocha.ts";
 import "../../deps/chai.ts";
 import {Connection} from "../../../src/connection/Connection.ts";
-import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections} from "../../utils/test-utils.ts";
+import {closeTestingConnections, createTestingConnections} from "../../utils/test-utils.ts";
 import {PromiseUtils} from "../../../src/index.ts";
 import { Book, Chapter, Page } from "./entity/Book.ts";
 
 describe("github issues > #3551 array of embedded documents through multiple levels are not handled", () => {
 
     let connections: Connection[];
-    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => {
         connections = await createTestingConnections({
             entities: [Book, Chapter, Page],