feat: support of js fixtures (#2)

marko-js · Nov 22, 2019 · 4341bf5 · 4341bf5
1 parent fb33dd8
commit 4341bf5
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -31,15 +31,15 @@ export function findComponentFixtures(
   const componentName = inferName(componentPath);
   const fixturesPath = path.join(path.dirname(componentPath), fixtureDir);
   const fixtures = glob
-    .sync("*.{json,marko}", { cwd: fixturesPath })
+    .sync("*.{json,marko,js}", { cwd: fixturesPath })
     .map((fixtureRelativePath: string) => {
       const fixturePath = path.join(fixturesPath, fixtureRelativePath);
       const fixtureExtension = path.extname(fixturePath);
       const fixtureName = path
         .basename(fixturePath)
         .slice(0, -1 * fixtureExtension.length);
       const renderFn =
-        fixtureExtension === ".json"
+        [".json", ".js"].indexOf(fixtureExtension) !== -1
           ? () => render(require(componentPath), require(fixturePath))
           : () => render(require(fixturePath));
       return {
@@ -56,13 +56,10 @@ export function findComponentFixtures(
         render: renderFn
       };
     })
-    .reduce(
-      (lookup, current) => {
-        lookup[current.name] = current;
-        return lookup;
-      },
-      {} as ComponentFixtures["fixtures"]
-    );
+    .reduce((lookup, current) => {
+      lookup[current.name] = current;
+      return lookup;
+    }, {} as ComponentFixtures["fixtures"]);
   if (Object.keys(fixtures).length) {
     return {
       get component() {

diff --git a/test/components/container/fixtures/data.html b/test/components/container/fixtures/data.html
@@ -0,0 +1,8 @@
+<div
+  class="container"
+>
+  <p>
+    Hello
+  </p>
+  Async content
+</div>
diff --git a/test/components/container/fixtures/data.js b/test/components/container/fixtures/data.js
@@ -0,0 +1,4 @@
+module.exports = {
+  renderBody: out => out.w("<p>Hello</p>"),
+  model: Promise.resolve("Async content")
+};
diff --git a/test/components/container/index.marko b/test/components/container/index.marko
@@ -0,0 +1,9 @@
+<div.container>
+  <${input.renderBody}/>
+
+  <await(input.model)>
+    <@then|model|>
+      ${model}
+    </@then>
+  </await>
+</div>
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -60,6 +60,25 @@ describe("findProjectFixtures", () => {
   test("finds fixtures", () => {
     expect(findProjectFixtures(__dirname)).toMatchInlineSnapshot(`
       Array [
+        Object {
+          "component": [Component "(cwd)/test/components/container/index.marko"],
+          "fixtures": Object {
+            "data": Object {
+              "ext": ".js",
+              "fixture": Object {
+                "model": Promise {},
+                "renderBody": [Function],
+              },
+              "name": "data",
+              "path": "(cwd)/test/components/container/fixtures/data.js",
+              "render": [Function],
+              "toString": [Function],
+            },
+          },
+          "fixturesPath": "(cwd)/test/components/container/fixtures",
+          "name": "container",
+          "path": "(cwd)/test/components/container/index.marko",
+        },
         Object {
           "component": [Component "(cwd)/test/components/hello/index.marko"],
           "fixtures": Object {