updated nock and globals

Author: timea-solid

package-lock.json

@@ -109,13 +109,13 @@
     "eslint-plugin-n": "^17.21.3",
     "eslint-plugin-promise": "^7.2.1",
     "get-random-values": "^4.0.0",
-    "globals": "^16.3.0",
+    "globals": "^17.1.0",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.0.5",
     "jsdom": "^27.4.0",
     "neostandard": "^0.12.2",
-    "nock": "^13.5.6",
+    "nock": "^15.0.0",
     "rdflib": "^2.3.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

package.json

@@ -2,6 +2,7 @@ import { toContainGraph } from '../custom-matchers/toContainGraph'
 import { toEqualGraph } from '../custom-matchers/toEqualGraph'
 import 'isomorphic-fetch'
 import { TextEncoder, TextDecoder } from 'util'
+import { TransformStream, ReadableStream, WritableStream } from 'stream/web'
 
 // https://stackoverflow.com/questions/52612122/how-to-use-jest-to-test-functions-using-crypto-or-window-mscrypto
 
@@ -14,6 +15,9 @@ global.crypto = {
 
 global.TextEncoder = TextEncoder
 global.TextDecoder = TextDecoder
+global.TransformStream = TransformStream
+global.ReadableStream = ReadableStream
+global.WritableStream = WritableStream
 
 // Mock external dependencies that solid-logic expects
 jest.mock('$rdf', () => require('rdflib'), { virtual: true })

test/helpers/setup.ts

@@ -96,10 +96,25 @@ async function wait (ms) {
   })
 }
 
+// Helper to set up default nock mocks for wikidata queries
+async function setupWikidataMock () {
+  const fakeResponse = await getFileContent('test/unit/widgets/forms/autocomplete/broken-sparql-response-small.txt')
+  return nock('https://query.wikidata.org')
+    .persist()
+    .get(/^\/sparql/)
+    .reply(200, fakeResponse, { 'Content-Type': 'application/sparql-results+json' })
+}
+
 describe('autocompleteField', () => {
   let result
   beforeEach(() => {
-    // fetch.resetMocks();
+    nock.cleanAll()
+    nock.disableNetConnect()
+  })
+
+  afterEach(() => {
+    nock.cleanAll()
+    nock.enableNetConnect()
   })
 
   it('exists as a function', () => {
@@ -186,6 +201,7 @@ describe('autocompleteField', () => {
   })
 
   it('makes Cancel button appear when user inputs something', async () => {
+    await setupWikidataMock()
     const container = document.createElement('div')
     const already = {}
     const callbackFunction = () => {} // was jest.fn() // TODO: https://github.com/solidos/solid-ui/issues/263
@@ -212,6 +228,7 @@ describe('autocompleteField', () => {
   })
 
   it('makes Cancel button work when user inputs something', async () => {
+    await setupWikidataMock()
     const container = document.createElement('div')
     const already = {}
     const callbackFunction = () => {} // was jest.fn() // TODO: https://github.com/solidos/solid-ui/issues/263
@@ -244,6 +261,7 @@ describe('autocompleteField', () => {
   })
 
   it('on inpt fetches data (fixing wikidata timeout issue) making green table', async () => {
+    await setupWikidataMock()
     const container = document.createElement('div')
     const already = {}
     const callbackFunction = () => {} // was jest.fn() // TODO: https://github.com/solidos/solid-ui/issues/263
@@ -258,25 +276,21 @@ describe('autocompleteField', () => {
       callbackFunction
     )
     const inputElement = await findByTestId(result, 'autocomplete-input') as HTMLInputElement
-    const fakeResponse = await getFileContent('test/unit/widgets/forms/autocomplete/broken-sparql-response-small.txt')
-
-    nock('https://query.wikidata.org')
-      .get(/^\/sparql/)
-      .reply(200, fakeResponse) // replyWithFile?
 
     inputElement.value = 'mass'
 
     const event1 = new Event('input')
     inputElement.dispatchEvent(event1)
 
     const table = await findByTestId(result, 'autocomplete-table')
-    await waitFor(() => expect(table.children.length).toEqual(4))
+    await waitFor(() => expect(table.children.length).toEqual(4), { timeout: 5000 })
     expect(table.children.length).toBeGreaterThan(1)
     expect(table).toMatchSnapshot()
     expect(table.children[1].style.color).toEqual('rgb(0, 136, 0)') // green as all loaded
   })
 
   it('typing more search term till unique selects the whole name and sets the accecpt button active', async () => {
+    await setupWikidataMock()
     const container = document.createElement('div')
     const already = {}
     const callbackFunction = () => {} // was jest.fn() // TODO: https://github.com/solidos/solid-ui/issues/263
@@ -291,11 +305,6 @@ describe('autocompleteField', () => {
       callbackFunction
     )
     const inputElement = await findByTestId(result, 'autocomplete-input') as HTMLInputElement
-    const fakeResponse = await getFileContent('test/unit/widgets/forms/autocomplete/broken-sparql-response-small.txt')
-
-    nock('https://query.wikidata.org')
-      .get(/^\/sparql/)
-      .reply(200, fakeResponse) // replyWithFile?
 
     inputElement.value = 'mass'
 
@@ -324,6 +333,7 @@ describe('autocompleteField', () => {
   })
 
   it('clicking on row of greenn table then accecpt button saves data', async () => {
+    await setupWikidataMock()
     const container = document.createElement('div')
     const already = {}
     const callbackFunction = () => {} // was jest.fn() // TODO: https://github.com/solidos/solid-ui/issues/263
@@ -338,11 +348,6 @@ describe('autocompleteField', () => {
       callbackFunction
     )
     const inputElement = await findByTestId(result, 'autocomplete-input') as HTMLInputElement
-    const fakeResponse = await getFileContent('test/unit/widgets/forms/autocomplete/broken-sparql-response-small.txt')
-
-    nock('https://query.wikidata.org')
-      .get(/^\/sparql/)
-      .reply(200, fakeResponse) // replyWithFile?
 
     inputElement.value = 'mass'