Skip to content

Commit 7850b01

Browse files
committed
mv ./lib/session.js ./lib/session/index.js
1 parent 821f56a commit 7850b01

4 files changed

Lines changed: 1 addition & 160 deletions

File tree

lib/session/test/index.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import assert from 'node:assert/strict'
22
import { describe, it, after, before } from 'node:test'
33

4-
<<<<<<<< HEAD:lib/session/test/index.js
54
import User from '../../user/index.js'
65
import Session from '../index.js'
76
import userCase from '../../user/test/user.json' with { type: 'json' }
8-
========
9-
import User from '../index.js'
10-
import Session from '../session.js'
11-
import userCase from './user.json' with { type: 'json' }
12-
>>>>>>>> a2746b1 (mv ./lib/session ./lib/user/session):lib/user/test/session.js
137

148
const sessionUser = {
159
...userCase,

lib/user/session.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

lib/user/test/session.js

Lines changed: 0 additions & 71 deletions
This file was deleted.

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ else
3030
# npm i --no-save node-test-github-reporter
3131
# $NODE --test --test-reporter=node-test-github-reporter
3232
# fi
33-
$NODE --test --test-reporter=spec lib/*/test/*.js lib/*.test.js routes/*.test.js
33+
$NODE --test --test-reporter=spec lib/*/test/index.js lib/*.test.js routes/*.test.js
3434
fi

0 commit comments

Comments
 (0)