Skip to content

Commit ca7cfe9

Browse files
committed
test: Try semver-compare
1 parent 043f941 commit ca7cfe9

File tree

6 files changed

+44
-22
lines changed

6 files changed

+44
-22
lines changed

package-lock.json

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
},
3838
"devDependencies": {
3939
"@yao-pkg/pkg": "^6.0.0",
40-
"jest": "^29.7.0"
40+
"jest": "^29.7.0",
41+
"semver-compare": "^1.0.0"
4142
},
4243
"jest": {
4344
"rootDir": "./test/jest",

test/jest/exec.test.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
const cmp = require('semver-compare');
12
const { emacsVersion, TestContext } = require("./helpers");
23

34
describe("exec", () => {
45
const ctx = new TestContext("./test/jest/exec");
56

6-
// See https://github.com/emacs-eask/cli/issues/11.
7-
const avoid11 = (emacsVersion() < "28.1");
8-
97
beforeAll(async () => {
10-
await ctx.runEask("install-deps", { timeout: 40000 }, avoid11)
8+
await ctx.runEask(
9+
"install-deps", { timeout: 40000 },
10+
// See https://github.com/emacs-eask/cli/issues/11.
11+
cmp(await emacsVersion(), "28.1") == -1))
1112
});
1213

1314
afterAll(() => ctx.cleanUp());

test/jest/install.test.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1+
const cmp = require('semver-compare');
12
const { emacsVersion, TestContext } = require("./helpers");
23

34
describe("install and uninstall", () => {
45
describe("in ./install", () => {
56
const ctx = new TestContext("./test/jest/install/");
67
const packageName = "mini.pkg.1";
78

8-
// See https://github.com/emacs-eask/cli/issues/11.
9-
const avoid11 = (emacsVersion() < "28.1");
10-
119
beforeAll(async () => {
1210
await ctx.runEask("clean all");
1311
});
1412

1513
afterAll(() => ctx.cleanUp());
1614

1715
it("installs project package", async () => {
18-
await ctx.runEask("package", avoid11); // creates dist/<pkg>.tar
19-
await ctx.runEask("install"); // installs dependencies and generated package
16+
// creates dist/<pkg>.tar
17+
await ctx.runEask("package",
18+
// See https://github.com/emacs-eask/cli/issues/11.
19+
cmp(await emacsVersion(), "28.1") == -1);
20+
// installs dependencies and generated package
21+
await ctx.runEask("install");
2022
const { stderr } = await ctx.runEask("list");
2123
expect(stderr).toMatch(packageName);
2224
});
@@ -39,13 +41,18 @@ describe("install and uninstall", () => {
3941
});
4042

4143
it("uninstalls project package", async () => {
42-
await ctx.runEask("uninstall", avoid11);
44+
await ctx.runEask("uninstall",
45+
// See https://github.com/emacs-eask/cli/issues/11.
46+
cmp(await emacsVersion(), "28.1") == -1);
4347
const { stderr } = await ctx.runEask("list");
4448
expect(stderr).not.toMatch(packageName);
4549
});
4650

4751
it("installs dependencies", async () => {
48-
const { stderr } = await ctx.runEask("install-deps", { timeout: 40000 }, avoid11);
52+
const { stderr } = await ctx.runEask(
53+
"install-deps", { timeout: 40000 },
54+
// See https://github.com/emacs-eask/cli/issues/11.
55+
cmp(await emacsVersion(), "28.1") == -1);
4956
expect(stderr).not.toMatch(packageName);
5057
});
5158

test/jest/local.test.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
// Notice, below we clone a random package (repo) that uses Eask as the
55
// dependencies management tool.
66

7+
const cmp = require('semver-compare');
78
const { emacsVersion, TestContext } = require("./helpers");
89

910
describe("local", () => {
1011
const cwd = "./test/jest/local";
1112
const ctx = new TestContext(cwd);
1213

13-
// See https://github.com/emacs-eask/cli/issues/11.
14-
const avoid11 = (emacsVersion() < "28.1");
15-
1614
// NOTE: `install-deps` takes a long time in this package
1715
// this is because of recipe dependencies triggering
1816
// "temporary archives" build.
1917
beforeAll(async () => {
20-
await ctx.runEask("install-deps", { timeout: 40000 }, avoid11)
18+
await ctx.runEask(
19+
"install-deps", { timeout: 40000 },
20+
// See https://github.com/emacs-eask/cli/issues/11.
21+
cmp(await emacsVersion(), "28.1") == -1);
2122
});
2223

2324
afterAll(() => ctx.cleanUp());
@@ -83,7 +84,10 @@ describe("local", () => {
8384

8485
describe("Development", () => {
8586
beforeAll(async () => {
86-
await ctx.runEask("install-deps", { timeout: 40000 }, avoid11)
87+
await ctx.runEask(
88+
"install-deps", { timeout: 40000 },
89+
// See https://github.com/emacs-eask/cli/issues/11.
90+
((await emacsVersion()) < "28.1"))
8791
});
8892

8993
// this requires install-deps

test/jest/outdated-upgrade.test.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
const cmp = require('semver-compare');
12
const { emacsVersion, TestContext } = require("./helpers");
23

34
describe("outdated and upgrade", () => {
45
const ctx = new TestContext("./test/jest/outdated-upgrade");
56

6-
// See https://github.com/emacs-eask/cli/issues/11.
7-
const avoid11 = (emacsVersion() < "28.1");
8-
97
beforeAll(async () => {
10-
await ctx.runEask("install-deps", { timeout: 40000 }, avoid11);
8+
await ctx.runEask(
9+
"install-deps", { timeout: 40000 },
10+
// See https://github.com/emacs-eask/cli/issues/11.
11+
cmp(await emacsVersion(), "28.1") == -1);
1112
await ctx.runEask("load make-outdate.el");
1213
});
1314

0 commit comments

Comments
 (0)