test: fix test env

zazuko · Apr 16, 2024 · 493d185 · 493d185
1 parent 5494ff4
commit 493d185
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/lit-helpers/package.json b/packages/lit-helpers/package.json
@@ -36,13 +36,10 @@
   },
   "devDependencies": {
     "@open-wc/testing": "^3.1.6",
-    "@rdfjs/environment": "^1",
     "@rdfine/rdfs": "^0.8.4",
-    "@rdfjs/data-model": "^2",
-    "@rdfjs/dataset": "^2",
     "@rdfjs/types": "^1.1.0",
     "@tpluscode/rdfine": "^0.7.5",
-    "@types/clownface": "^2.0.7",
+    "@zazuko/env": "^2.1.1",
     "crypto-js": "^4.2.0",
     "typescript": "^4.7.2"
   }

diff --git a/packages/lit-helpers/test/env.js b/packages/lit-helpers/test/env.js
@@ -1,6 +1,6 @@
-import Environment from '@rdfjs/environment/Environment.js'
+import Environment from '@zazuko/env/Environment.js'
+import parent from '@zazuko/env/web.js'
 import { RdfsFactory } from '@rdfine/rdfs/Factory'
 import { RdfineFactory } from '@tpluscode/rdfine'
-import DataFactory from '@rdfjs/data-model/Factory.js'
 
-export default new Environment([RdfineFactory, RdfsFactory, DataFactory])
+export default new Environment([RdfineFactory, RdfsFactory], { parent })
diff --git a/packages/lit-helpers/test/localizedLabel.test.js b/packages/lit-helpers/test/localizedLabel.test.js
@@ -1,6 +1,4 @@
 import { html, fixture, expect, nextFrame } from '@open-wc/testing'
-import clownface from 'clownface'
-import $rdf from '@rdfjs/dataset'
 import { rdfs, sh } from '@tpluscode/rdf-ns-builders'
 import { setLanguages } from '../index.js'
 import { localizedLabel } from '../localizedLabel.js'
@@ -9,7 +7,7 @@ import env from './env.js'
 describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
   it("renders pointer's rdfs:label property in preferred language", async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer
       .addOut(rdfs.label, pointer.literal('Apfel', 'de'))
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -25,7 +23,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('skips languages not found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer
       .addOut(rdfs.label, pointer.literal('Apfel', 'de'))
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -41,7 +39,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('falls back to any language when no matching tag is found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer.addOut(rdfs.label, pointer.literal('Apfel', 'de'))
     setLanguages('fr', 'pl')
 
@@ -54,7 +52,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('works with rdfine object', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     const resource = env.rdfine.rdfs.Resource(pointer, {
       label: 'Apple',
     })
@@ -68,7 +66,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('updates existing usages when language is changed', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const apple = pointer
       .blankNode()
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -94,7 +92,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('updates existing fallback usages when language is changed', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const fruit = pointer.blankNode()
 
     // when
@@ -111,7 +109,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('renders fallback when no label is found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const res = pointer.blankNode()
 
     // when
@@ -125,10 +123,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('supports changing the label property', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).addOut(
-      sh.name,
-      'Property'
-    )
+    const pointer = env.clownface().addOut(sh.name, 'Property')
     const res = pointer.blankNode()
 
     // when
@@ -147,10 +142,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('binds to property', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).addOut(
-      sh.name,
-      'Property'
-    )
+    const pointer = env.clownface().addOut(sh.name, 'Property')
     const res = pointer.blankNode()
 
     // when
@@ -169,10 +161,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('binds to attribute', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).addOut(
-      sh.name,
-      'Property'
-    )
+    const pointer = env.clownface().addOut(sh.name, 'Property')
     const res = pointer.blankNode()
 
     // when

diff --git a/packages/lit-helpers/test/localizedLiteral.test.js b/packages/lit-helpers/test/localizedLiteral.test.js
@@ -1,6 +1,4 @@
 import { html, fixture, expect, nextFrame } from '@open-wc/testing'
-import clownface from 'clownface'
-import $rdf from '@rdfjs/dataset'
 import { rdfs, sh, skos } from '@tpluscode/rdf-ns-builders'
 import { setLanguages } from '../index.js'
 import { localizedLabel } from '../localizedLabel.js'
@@ -9,7 +7,7 @@ import env from './env.js'
 describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
   it("renders pointer's rdfs:label property in preferred language", async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer
       .addOut(rdfs.label, pointer.literal('Apfel', 'de'))
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -25,7 +23,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('skips languages not found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer
       .addOut(rdfs.label, pointer.literal('Apfel', 'de'))
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -41,7 +39,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('falls back to any language when no matching tag is found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer.addOut(rdfs.label, pointer.literal('Apfel', 'de'))
     setLanguages('fr', 'pl')
 
@@ -54,7 +52,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('works with rdfine object', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     const resource = env.rdfine.rdfs.Resource(pointer, {
       label: 'Apple',
     })
@@ -68,7 +66,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('updates existing usages when language is changed', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const apple = pointer
       .blankNode()
       .addOut(rdfs.label, pointer.literal('Apple', 'en'))
@@ -94,7 +92,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('updates existing fallback usages when language is changed', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const fruit = pointer.blankNode()
 
     // when
@@ -111,7 +109,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('renders fallback when no label is found', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() })
+    const pointer = env.clownface()
     const res = pointer.blankNode()
 
     // when
@@ -125,10 +123,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('supports changing the label property', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).addOut(
-      sh.name,
-      'Property'
-    )
+    const pointer = env.clownface().addOut(sh.name, 'Property')
     const res = pointer.blankNode()
 
     // when
@@ -147,7 +142,7 @@ describe('@rdfjs-elements/lit-helpers/localizedLabel.js', () => {
 
   it('supports multiple alternative label properties', async () => {
     // given
-    const pointer = clownface({ dataset: $rdf.dataset() }).blankNode()
+    const pointer = env.clownface().blankNode()
     pointer.addOut(skos.altLabel, pointer.literal('Malus domestica'))
 
     // when