test: fix breaking tests

edge-js · Jan 4, 2024 · 323c89a · 323c89a
1 parent 53192ce
commit 323c89a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/tests/linker.spec.ts b/tests/linker.spec.ts
@@ -41,19 +41,13 @@ test.group('Views Linker | .edge', () => {
           "colStart": 13,
           "line": 0,
         },
-        {
-          "colEnd": 21,
-          "colStart": 9,
-          "line": 5,
-        },
       ]
     `)
 
     const paths = result.map((r) => r.templatePath)
 
     assert.sameDeepMembers(paths, [
       slash(join(fs.basePath, 'resources/views/components/button.edge')),
-      slash(join(fs.basePath, 'resources/views/layouts/base.edge')),
     ])
   })
 

diff --git a/tests/template_indexer.spec.ts b/tests/template_indexer.spec.ts
@@ -23,13 +23,17 @@ test.group('Template indexer | Scan', () => {
         disk: 'default',
         isComponent: true,
         componentName: 'button',
+        selfClosedInsertText: `button(\${1})`,
+        insertText: `button(\${1}) \n\t$0\n@end`,
       },
       {
         path: slash(join(fs.basePath, 'resources/views/layouts/base.edge')),
         name: 'layouts/base',
         disk: 'default',
         isComponent: false,
         componentName: null,
+        selfClosedInsertText: `null(\${1})`,
+        insertText: `null(\${1}) \n\t$0\n@end`,
       },
     ])
   })
@@ -42,7 +46,7 @@ test.group('Template indexer | Scan', () => {
 
     const indexer = new TemplateIndexer({
       rootPath: fs.basePath,
-      disks: { default: 'resources/views', dimerr: '@dimer' },
+      disks: { default: 'resources/views', dimer: '@dimer' },
     })
 
     const result = await indexer.scan()
@@ -54,27 +58,35 @@ test.group('Template indexer | Scan', () => {
         disk: 'default',
         isComponent: true,
         componentName: 'button',
+        selfClosedInsertText: `button(\${1})`,
+        insertText: `button(\${1}) \n\t$0\n@end`,
       },
       {
         path: slash(join(fs.basePath, 'resources/views/layouts/base.edge')),
         name: 'layouts/base',
         disk: 'default',
         isComponent: false,
         componentName: null,
+        selfClosedInsertText: `null(\${1})`,
+        insertText: `null(\${1}) \n\t$0\n@end`,
       },
       {
         path: slash(join(fs.basePath, 'node_modules/@dimer/components/foo.edge')),
-        name: 'dimerr::components/foo',
-        disk: 'dimerr',
+        name: 'dimer::components/foo',
+        disk: 'dimer',
         isComponent: true,
-        componentName: 'dimerr.foo',
+        componentName: 'dimer.foo',
+        selfClosedInsertText: `dimer.foo(\${1})`,
+        insertText: `dimer.foo(\${1}) \n\t$0\n@end`,
       },
       {
         path: slash(join(fs.basePath, 'node_modules/@dimer/layouts/foo.edge')),
-        name: 'dimerr::layouts/foo',
-        disk: 'dimerr',
+        name: 'dimer::layouts/foo',
+        disk: 'dimer',
         isComponent: false,
         componentName: null,
+        selfClosedInsertText: `null(\${1})`,
+        insertText: `null(\${1}) \n\t$0\n@end`,
       },
     ])
   })
@@ -115,7 +127,7 @@ test.group('Template indexer | Scan', () => {
 
     const result = await indexer.scan()
 
-    assert.includeDeepMembers(result, [
+    assert.containsSubset(result, [
       {
         path: slash(join(fs.basePath, 'resources/views/components/button.edge')),
         name: 'components/button',
@@ -153,23 +165,23 @@ test.group('Template indexer | Scan', () => {
 
     const indexer = new TemplateIndexer({
       rootPath: fs.basePath,
-      disks: { default: 'resources/views', dimerr: '@dimer' },
+      disks: { default: 'resources/views', dimer: '@dimer' },
     })
 
     const result = await indexer.scan()
 
-    assert.includeDeepMembers(result, [
+    assert.containsSubset(result, [
       {
         path: slash(join(fs.basePath, 'node_modules/@dimer/components/foo.edge')),
-        name: 'dimerr::components/foo',
-        disk: 'dimerr',
+        name: 'dimer::components/foo',
+        disk: 'dimer',
         isComponent: true,
-        componentName: 'dimerr.foo',
+        componentName: 'dimer.foo',
       },
       {
         path: slash(join(fs.basePath, 'node_modules/@dimer/layouts/foo.edge')),
-        name: 'dimerr::layouts/foo',
-        disk: 'dimerr',
+        name: 'dimer::layouts/foo',
+        disk: 'dimer',
         isComponent: false,
         componentName: null,
       },
@@ -189,7 +201,7 @@ test.group('Template indexer | Scan', () => {
     })
 
     const result = await indexer.scan()
-    assert.includeDeepMembers(result, [
+    assert.containsSubset(result, [
       {
         path: slash(join(fs.basePath, 'resources/views/components/button/index.edge')),
         name: 'components/button/index',