Skip to content

Commit 2ec786b

Browse files
authored
Merge pull request #187 from SolidOS/fixAuthTests
fix: mock solid-logic to resolve webpack bundle errors in Jest tests
2 parents d8507d0 + 706799f commit 2ec786b

6 files changed

Lines changed: 1066 additions & 916 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
push:
88
branches:
99
- main
10+
- staging
1011
pull_request:
1112
branches:
1213
- main
14+
- staging
1315
workflow_dispatch:
1416

1517
jobs:

babel.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default {
1010
],
1111
],
1212
plugins: [
13+
'babel-plugin-transform-import-meta',
1314
[
1415
'babel-plugin-inline-import', {
1516
extensions: [

dev/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ const webId = document.getElementById('webId')
1010
loginBanner.appendChild(UI.login.loginStatusBox(document, null, {}))
1111

1212
async function finishLogin () {
13-
await logic.authSession.handleIncomingRedirect()
13+
await logic.authn.checkUser()
1414
const session = logic.authSession
15-
if (session.info.isLoggedIn) {
15+
const isLoggedIn = session?.info?.isLoggedIn ?? session?.isActive ?? Boolean(session?.webId)
16+
if (isLoggedIn) {
1617
// Update the page with the status.
1718
webId.innerHTML = 'Logged in as: ' + logic.authn.currentUser().uri
1819
} else {

jest.config.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ export default {
66
customExportConditions: ['node']
77
},
88
setupFilesAfterEnv: ["./test/helpers/jest.setup.js"],
9-
transformIgnorePatterns: ["/node_modules/(?!lit-html).+\\.js"],
9+
transform: {
10+
'^.+\\.m?js$': 'babel-jest',
11+
},
12+
transformIgnorePatterns: ['node_modules/(?!.*(?:@uvdsl|uuid|@noble|lit-html|lit-element|lit|@lit|@lit-labs|solid-ui|solid-logic)(?:/|$))'],
1013
roots: ['<rootDir>/src', '<rootDir>/test'],
1114
moduleNameMapper: {
1215
'^SolidLogic$': 'solid-logic',

0 commit comments

Comments
 (0)