Skip to content

Commit

Permalink
Merge pull request #393 from KTH/issues/KUI-1537-update-dependencies
Browse files Browse the repository at this point in the history
KUI-1537: dependency updates
  • Loading branch information
axelbjo authored Oct 25, 2024
2 parents 813f468 + 2e3cc39 commit 9abd283
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 93 deletions.
145 changes: 65 additions & 80 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@kth/session": "^3.0.9",
"@kth/style": "^1.4.2",
"@kth/ug-rest-api-helper": "^1.0.26",
"@tinymce/tinymce-react": "^4.3.2",
"@tinymce/tinymce-react": "^5.1.1",
"axios": "^1.7.2",
"body-parser": "^1.20.2",
"cookie-parser": "^1.4.6",
Expand All @@ -71,7 +71,8 @@
"react-router-hash-link": "^2.4.3",
"react-sticky": "^6.0.3",
"reactstrap": "^9.2.2",
"safe-utils": "^1.0.1"
"safe-utils": "^1.0.1",
"tinymce": "^7.4.1"
},
"devDependencies": {
"@babel/cli": "^7.24.6",
Expand Down Expand Up @@ -99,7 +100,6 @@
"jest-extended": "^4.0.2",
"lint-staged": "^15.2.5",
"mini-css-extract-plugin": "^2.9.0",
"mockery": "^2.1.0",
"nock": "^13.5.4",
"node-mocks-http": "^1.14.1",
"node-notifier": "^10.0.1",
Expand Down
17 changes: 7 additions & 10 deletions test/unit/test-MemoCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@

const { expect } = require('chai')
const nock = require('nock')
const mockery = require('mockery')
const httpMocks = require('node-mocks-http')

const mockLogger = {}
mockLogger.debug = mockLogger.info = mockLogger.error = mockLogger.warn = () => {}
mockLogger.init = () => {}

mockery.registerMock('@kth/log', mockLogger)
mockery.enable({
warnOnReplace: false,
warnOnUnregistered: false,
})
jest.mock('@kth/log', () => ({
debug: jest.fn(),
info: jest.fn(),
error: jest.fn(),
warn: jest.fn(),
init: jest.fn(),
}))

const paths = require('../mocks/apipaths.json')
const api = nock('http://localhost:3001/api/node').get('/_paths').reply(200, paths).get('/_checkAPIkey').reply(200, {})
Expand Down

0 comments on commit 9abd283

Please sign in to comment.