Skip to content

Commit c8cc5cd

Browse files
committed
[INTERNAL] Memory Adapter: Cleanup comments and move test helper functions to top of file
1 parent 4a9bfad commit c8cc5cd

File tree

2 files changed

+29
-31
lines changed

2 files changed

+29
-31
lines changed

lib/adapters/Memory.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class Memory extends AbstractAdapter {
5858
});
5959

6060
if (!options.nodir) {
61-
// TODO: Add tests for all this
6261
const dirPaths = Object.keys(this._virDirs);
6362
const matchedDirs = micromatch(dirPaths, patterns, {
6463
dot: true
@@ -120,7 +119,6 @@ class Memory extends AbstractAdapter {
120119
pathSegments.pop(); // Remove last segment representing the resource itself
121120

122121
pathSegments.forEach((segment, i) => {
123-
// segment = "/" + segment;
124122
if (i >= 1) {
125123
segment = pathSegments[i - 1] + "/" + segment;
126124
}

test/lib/adapters/Memory.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
const {test} = require("ava");
22
const {resourceFactory} = require("../../../");
33

4+
async function fillFromFs(readerWriter) {
5+
const fsReader = resourceFactory.createAdapter({
6+
fsBasePath: "./test/fixtures/glob",
7+
virBasePath: "/app/",
8+
});
9+
10+
const fsResources = await fsReader.byGlob("/**/*");
11+
return Promise.all(fsResources.map(function(resource) {
12+
return readerWriter.write(resource);
13+
}));
14+
}
15+
16+
function matchGlobResult(t, resources, expectedResources) {
17+
t.deepEqual(resources.length, expectedResources.length, "Amount of files matches expected result.");
18+
19+
const matchedResources = resources.map((resource) => {
20+
return resource.getPath();
21+
});
22+
23+
for (let i = 0; i < expectedResources.length; i++) {
24+
const expectedResource = expectedResources[i];
25+
t.true(
26+
matchedResources.indexOf(expectedResource) !== -1,
27+
"File '" + expectedResource + "' was found."
28+
);
29+
}
30+
}
31+
432
test("GLOB resources from application.a w/ virtual base path prefix", async (t) => {
533
const readerWriter = resourceFactory.createAdapter({
634
virBasePath: "/app/"
@@ -69,35 +97,7 @@ test("GLOB virtual directory w/ virtual base path prefix and nodir: true", async
6997
t.deepEqual(resources.length, 0, "Found no resources");
7098
});
7199

72-
// Load more data from FS into memory
73-
async function fillFromFs(readerWriter) {
74-
const fsReader = resourceFactory.createAdapter({
75-
fsBasePath: "./test/fixtures/glob",
76-
virBasePath: "/app/",
77-
});
78-
79-
const fsResources = await fsReader.byGlob("/**/*");
80-
return Promise.all(fsResources.map(function(resource) {
81-
return readerWriter.write(resource);
82-
}));
83-
}
84-
85-
function matchGlobResult(t, resources, expectedResources) {
86-
t.deepEqual(resources.length, expectedResources.length, "Amount of files matches expected result.");
87-
88-
const matchedResources = resources.map((resource) => {
89-
return resource.getPath();
90-
});
91-
92-
for (let i = 0; i < expectedResources.length; i++) {
93-
const expectedResource = expectedResources[i];
94-
t.true(
95-
matchedResources.indexOf(expectedResource) !== -1,
96-
"File '" + expectedResource + "' was found."
97-
);
98-
}
99-
}
100-
100+
/* Load more data from FS into memory */
101101
test("GLOB all", async (t) => {
102102
const readerWriter = resourceFactory.createAdapter({
103103
virBasePath: "/app/"

0 commit comments

Comments
 (0)