fixed tests and style

Author: timea-solid

src/style.js

@@ -165,5 +165,3 @@ export const style = { // styleModule
 style.setStyle = function setStyle (ele, styleName) {
   ele.style = style[styleName]
 }
-
-module.exports = style // @@ No way to do this in ESM

src/widgets/forms/basic.ts

@@ -131,8 +131,9 @@ export function basicField (
   let params = fieldParams[uri]
   if (params === undefined) params = { style: '' } // non-bottom field types can do this
   const paramStyle = params.style || ''
+  const inputStyle = style.textInputStyle + paramStyle
   const field = dom.createElement('input')
-  ;(field as any).style = style.textInputStyle + paramStyle
+  ;(field as any).style = inputStyle
   rhs.appendChild(field)
   field.setAttribute('type', params.type ? params.type : 'text')
 
@@ -156,7 +157,7 @@ export function basicField (
     /* istanbul ignore next */
     field.value = obj.value || obj.value || ''
   }
-  field.setAttribute('style', style)
+  field.setAttribute('style', inputStyle)
   if (!kb.updater) {
     throw new Error('kb has no updater')
   }
@@ -176,7 +177,7 @@ export function basicField (
       if (params.pattern) {
         field.setAttribute(
           'style',
-          style +
+          inputStyle +
             (field.value.match(params.pattern)
               ? 'color: green;'
               : 'color: red;')
@@ -191,7 +192,7 @@ export function basicField (
       // i.e. lose focus with changed data
       if (params.pattern && !field.value.match(params.pattern)) return
       field.disabled = true // See if this stops getting two dates from fumbling e.g the chrome datepicker.
-      field.setAttribute('style', style + 'color: gray;') // pending
+      field.setAttribute('style', inputStyle + 'color: gray;') // pending
       const ds = kb.statementsMatching(subject, property as any) // remove any multiple values
       let result
       if (params.namedNode) {
@@ -255,7 +256,7 @@ export function basicField (
         // kb.updater.update(ds, is, function (uri, ok, body) {
         if (ok) {
           field.disabled = false
-          field.setAttribute('style', style)
+          field.setAttribute('style', inputStyle)
         } else {
           box.appendChild(errorMessageBlock(dom, body))
         }

test/unit/acl/acl.mocks.ts

@@ -1,5 +1,5 @@
 import { sym } from 'rdflib'
-import * as ns from '../../../src/ns'
+import ns from '../../../src/ns'
 import { getFileContent } from '../helpers/getFileContent'
 import { resolve } from 'path'
 

test/unit/acl/styles.test.ts

@@ -1,10 +1,10 @@
 import { silenceDebugMessages } from '../helpers/debugger'
-import * as Style from '../../../src/style'
+import { style } from '../../../src/style'
 
 silenceDebugMessages()
 
 describe('Style', () => {
   it('exists', () => {
-    expect(typeof Style).toEqual('object')
+    expect(typeof style).toEqual('object')
   })
 })

test/unit/index.test.ts

@@ -32,7 +32,6 @@ describe('Index', () => {
       'table',
       'tabs',
       'utils',
-      'versionInfo',
       'widgets'
     ])
   })

test/unit/ns.test.ts

@@ -1,10 +1,10 @@
 import { silenceDebugMessages } from './helpers/debugger'
-import { rdf } from '../../src/ns'
+import ns from '../../src/ns'
 
 silenceDebugMessages()
 
 describe('RDF Namespace', () => {
   it('gives the right URI for rdf:type', () => {
-    expect(rdf('type').uri).toEqual('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
+    expect(ns.rdf('type').uri).toEqual('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
   })
 })

test/unit/style.test.ts

@@ -1,61 +1,51 @@
 import { silenceDebugMessages } from './helpers/debugger'
-import {
-  buttonStyle,
-  classIconStyle,
-  formTextInput,
-  iconStyle,
-  messageBodyStyle,
-  multilineTextInputStyle,
-  pendingeditModifier,
-  signInAndUpButtonStyle,
-  textInputStyle
-} from '../../src/style'
+import { style } from '../../src/style'
 
 silenceDebugMessages()
 
 describe('textInputStyle', () => {
   it('exists', () => {
-    expect(typeof textInputStyle).toEqual('string')
+    expect(typeof style.textInputStyle).toEqual('string')
   })
 })
 
 describe('buttonStyle', () => {
   it('exists', () => {
-    expect(typeof buttonStyle).toEqual('string')
+    expect(typeof style.buttonStyle).toEqual('string')
   })
 })
 describe('iconStyle', () => {
   it('exists', () => {
-    expect(typeof iconStyle).toEqual('string')
+    expect(typeof style.iconStyle).toEqual('string')
   })
 })
 describe('classIconStyle', () => {
   it('exists', () => {
-    expect(typeof classIconStyle).toEqual('string')
+    expect(typeof style.classIconStyle).toEqual('string')
   })
 })
 describe('messageBodyStyle', () => {
   it('exists', () => {
-    expect(typeof messageBodyStyle).toEqual('string')
+    expect(typeof style.messageBodyStyle).toEqual('string')
   })
 })
 describe('pendingeditModifier', () => {
   it('exists', () => {
-    expect(typeof pendingeditModifier).toEqual('string')
+    expect(typeof style.pendingeditModifier).toEqual('string')
   })
 })
 describe('signInButtonStyle', () => {
   it('exists', () => {
-    expect(typeof signInAndUpButtonStyle).toEqual('string')
+    expect(typeof style.signInAndUpButtonStyle).toEqual('string')
   })
 })
 describe('formTextInput', () => {
   it('exists', () => {
-    expect(typeof formTextInput).toEqual('string')
+    expect(typeof style.formTextInput).toEqual('string')
   })
 })
 describe('multilineTextInputStyle', () => {
   it('exists', () => {
-    expect(typeof multilineTextInputStyle).toEqual('string')
+    expect(typeof style.multilineTextInputStyle).toEqual('string')
   })
 })

test/unit/tabs.test.ts

@@ -8,7 +8,7 @@ import { label } from '../../src/utils'
 import { solidLogicSingleton } from 'solid-logic'
 
 // @ts-ignore
-import { meeting, rdfs } from '../../src/ns'
+import ns from '../../src/ns'
 
 const store = solidLogicSingleton.store
 
@@ -36,9 +36,9 @@ describe('tabWidget', () => {
 
   describe('minimal setup of options', () => {
     beforeAll(() => {
-      const predicate = meeting('toolList')
+      const predicate = ns.meeting('toolList')
       store.add(subject, predicate, new Collection([item1, item2]), subject.doc())
-      store.add(item1, rdfs('label'), lit('Item 1'), subject.doc())
+      store.add(item1, ns.rdfs('label'), lit('Item 1'), subject.doc())
 
       tabWidgetElement = tabs.tabWidget({
         dom,
@@ -155,7 +155,7 @@ describe('tabWidget', () => {
     afterAll(clearStore)
 
     it('allows for tabs to be fetched from triples instead of a collection', () => {
-      const predicate = meeting('toolList')
+      const predicate = ns.meeting('toolList')
       store.add(subject, predicate, item1, subject.doc())
       store.add(subject, predicate, item2, subject.doc())
       store.add(subject, predicate, item3, subject.doc())
@@ -238,7 +238,7 @@ describe('tabWidget', () => {
       tabWidgetElement = tabs.tabWidget({
         renderMain,
         renderTab,
-        selectedTab: item2.uri,
+        selectedTab: item2,
         ...minimalOptions
       })
     })

test/unit/widgets/buttons.test.ts

@@ -44,13 +44,13 @@ import {
 } from '../../../src/widgets/buttons'
 import { graph, namedNode, NamedNode, sym } from 'rdflib'
 // @ts-ignore
-import { foaf, rdf, sioc, vcard } from '../../../src/ns'
+import ns from '../../../src/ns'
 // @ts-ignore
 import { icons } from '../../../src/iconBase'
 import { clearStore } from '../helpers/clearStore'
 import { domWithHead } from '../../helpers/dom-with-head'
 import { solidLogicSingleton } from 'solid-logic'
-import * as style from '../../../src/style'
+import { style } from '../../../src/style'
 const { iconBase } = icons
 const store = solidLogicSingleton.store
 
@@ -229,7 +229,7 @@ describe('createNameDiv', () => {
   })
 
   it('uses the name from the obj if no title is given', () => {
-    createNameDiv(dom, element, null, obj)
+    createNameDiv(dom, element, undefined, obj)
     expect(element.children[0].textContent).toEqual('name')
   })
 })
@@ -274,31 +274,31 @@ describe('findImage', () => {
     expect(findImage).toBeInstanceOf(Function)
   })
   it('handles foaf(Agent)', () =>
-    expect(findImage(foaf('Agent'))).toEqual(iconBase + 'noun_98053.svg'))
+    expect(findImage(ns.foaf('Agent'))).toEqual(iconBase + 'noun_98053.svg'))
   it('handles rdf(Resource)', () =>
-    expect(findImage(rdf('Resource'))).toEqual(iconBase + 'noun_98053.svg'))
+    expect(findImage(ns.rdf('Resource'))).toEqual(iconBase + 'noun_98053.svg'))
   it('handles sioc(avatar)', () => {
-    store.add(subject, sioc('avatar'), imageObject, subject.doc())
+    store.add(subject, ns.sioc('avatar'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('handles sioc(avatar)', () => {
-    store.add(subject, foaf('img'), imageObject, subject.doc())
+    store.add(subject, ns.foaf('img'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('handles vcard(logo)', () => {
-    store.add(subject, vcard('logo'), imageObject, subject.doc())
+    store.add(subject, ns.vcard('logo'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('handles vcard(hasPhoto)', () => {
-    store.add(subject, vcard('hasPhoto'), imageObject, subject.doc())
+    store.add(subject, ns.vcard('hasPhoto'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('handles vcard(photo)', () => {
-    store.add(subject, vcard('photo'), imageObject, subject.doc())
+    store.add(subject, ns.vcard('photo'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('handles foaf(depiction)', () => {
-    store.add(subject, foaf('depiction'), imageObject, subject.doc())
+    store.add(subject, ns.foaf('depiction'), imageObject, subject.doc())
     expect(findImage(subject)).toEqual(imageObject.uri)
   })
   it('returns null when nothing is found', () => expect(findImage(subject)).toBeNull())

test/unit/widgets/forms/basic.test.ts

@@ -6,7 +6,7 @@ import {
   basicField
 } from '../../../../src/widgets/forms/basic'
 import ns from '../../../../src/ns'
-import { textInputStyle } from '../../../../src/style'
+import { style } from '../../../../src/style'
 import { clearStore } from '../../helpers/clearStore'
 import { store } from 'solid-logic'
 
@@ -647,8 +647,8 @@ describe('basicField', () => {
       doc,
       callbackFunction
     )
-    const style = (result.childNodes[1].childNodes[0] as HTMLInputElement).getAttribute('style')
-    expect(style).toEqual('background-color: #eef; padding: 0.5em;  border: .05em solid #88c; border-radius:0.2em; font-size: 100%; margin:0.4em;text-align: right;')
+    const localStyle = (result.childNodes[1].childNodes[0] as HTMLInputElement).getAttribute('style')
+    expect(localStyle).toEqual('background-color: #eef; padding: 0.5em;  border: .05em solid #88c; border-radius:0.2em; font-size: 100%; margin:0.4em;text-align: right;')
   })
 
   it('Defaults to textInputStyle', () => {
@@ -671,8 +671,8 @@ describe('basicField', () => {
       doc,
       callbackFunction
     )
-    const style = (result.childNodes[1].childNodes[0] as HTMLInputElement).getAttribute('style')
-    expect(style).toEqual(textInputStyle)
+    const inputStyle = (result.childNodes[1].childNodes[0] as HTMLInputElement).getAttribute('style')
+    expect(inputStyle).toEqual(style.textInputStyle)
   })
 
   it('Can read type from fieldParams', () => {