Skip to content

Commit a42460b

Browse files
author
Alex Titarenko
committed
fix running unit tests on windows
1 parent 8c34cf9 commit a42460b

4 files changed

Lines changed: 13 additions & 19 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "git-essentials",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"description": "A collection of essential Git commands for your browser and Node.js",
55
"main": "dist/esm/index.js",
66
"types": "index.d.ts",

tests/GitIndex.test.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import path from 'path'
2-
31
import { GitIndex } from 'git-essentials/models/GitIndex'
42

53
import { makeFsFixture, FsFixtureData } from './helpers/makeFsFixture'
@@ -10,7 +8,7 @@ describe('GitIndex', () => {
108
it('GitIndex.from(buffer) - Simple', async () => {
119
// arrange
1210
const { fs, dir } = await makeFsFixture(gitIndexFsFixtureData as FsFixtureData)
13-
const buffer = Buffer.from(await fs.readFile(path.join(dir, 'simple-index')))
11+
const buffer = Buffer.from(await fs.readFile(`${dir}/simple-index`))
1412

1513
// act
1614
const index = await GitIndex.from(buffer)
@@ -28,7 +26,7 @@ describe('GitIndex', () => {
2826
it('GitIndex.from(buffer)', async () => {
2927
// arrange
3028
const { fs, dir } = await makeFsFixture(gitIndexFsFixtureData as FsFixtureData)
31-
const buffer = Buffer.from(await fs.readFile(path.join(dir, 'index')))
29+
const buffer = Buffer.from(await fs.readFile(`${dir}/index`))
3230

3331
// act
3432
const index = await GitIndex.from(buffer)
@@ -76,7 +74,7 @@ describe('GitIndex', () => {
7674
it('GitIndex round trip', async () => {
7775
// arrange
7876
const { fs, dir } = await makeFsFixture(gitIndexFsFixtureData as FsFixtureData)
79-
const buffer = Buffer.from(await fs.readFile(path.join(dir, 'index')))
77+
const buffer = Buffer.from(await fs.readFile(`${dir}/index`))
8078

8179
// act
8280
const index = await GitIndex.from(buffer)

tests/GitPackIndex.test.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import path from 'path'
2-
31
import { GitPackIndex } from 'git-essentials/models/GitPackIndex'
42
import { GitObject } from 'git-essentials/models/GitObject'
53
import { shasum } from 'git-essentials/utils/shasum'
@@ -14,7 +12,7 @@ describe('GitPackIndex', () => {
1412
// arrange
1513
const { fs, dir } = await makeFsFixture(gitPackIndexFsFixtureData as FsFixtureData)
1614
const idx = Buffer.from(await fs.readFile(
17-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx')
15+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx`
1816
))
1917

2018
// act
@@ -35,7 +33,7 @@ describe('GitPackIndex', () => {
3533
// arrange
3634
const { fs, dir } = await makeFsFixture(gitPackIndexFsFixtureData as FsFixtureData)
3735
const pack = Buffer.from(await fs.readFile(
38-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack')
36+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack`
3937
))
4038

4139
// act
@@ -56,10 +54,10 @@ describe('GitPackIndex', () => {
5654
// arrange
5755
const { fs, dir } = await makeFsFixture(gitPackIndexFsFixtureData as FsFixtureData)
5856
const idx = Buffer.from(await fs.readFile(
59-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx')
57+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx`
6058
))
6159
const pack = Buffer.from(await fs.readFile(
62-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack')
60+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack`
6361
))
6462

6563
// act
@@ -75,10 +73,10 @@ describe('GitPackIndex', () => {
7573
// arrange
7674
const { fs, dir } = await makeFsFixture(gitPackIndexFsFixtureData as FsFixtureData)
7775
const idx = Buffer.from(await fs.readFile(
78-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx')
76+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx`
7977
))
8078
const pack = Buffer.from(await fs.readFile(
81-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack')
79+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack`
8280
))
8381

8482
// act
@@ -107,10 +105,10 @@ WIP on master: fbd56b4 Add 'unpkg' key to package.json\n`)
107105
const { fs, dir } = await makeFsFixture(gitPackIndexFsFixtureData as FsFixtureData)
108106

109107
const idx = Buffer.from(await fs.readFile(
110-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx')
108+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.idx`
111109
))
112110
const pack = Buffer.from(await fs.readFile(
113-
path.join(dir, '.git', 'objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack')
111+
`${dir}/.git/objects/pack/pack-1a1e70d2f116e8cb0cb42d26019e5c7d0eb01888.pack`
114112
))
115113

116114
// act

tests/e2e.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import path from 'path'
2-
31
import { clone } from 'git-essentials'
42

53
import { integrationContext } from './helpers/integrationContext'
@@ -23,7 +21,7 @@ describe('e2e', () => {
2321
})
2422

2523
// assert
26-
const fileStat = await fs.lstat(path.join(dir, 'Welcome note.md'))
24+
const fileStat = await fs.lstat(`${dir}/Welcome note.md`)
2725
expect(fileStat.isFile()).toBe(true)
2826
})
2927
})

0 commit comments

Comments
 (0)