Skip to content

Commit 59be7f1

Browse files
jarchennjarchenn
committed
Merge remote-tracking branch 'origin/main' into translationUIgiven
# Conflicts: # test/api.js
2 parents 4d60c10 + 986187f commit 59be7f1

13 files changed

Lines changed: 212 additions & 26 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Lint and test
1+
name: Lint, Test, and Mutation
22

33
on:
44
push:
@@ -107,3 +107,103 @@ jobs:
107107

108108
- name: Test coverage
109109
uses: coverallsapp/github-action@v2
110+
111+
mutation-test:
112+
name: Stryker Mutation Tests
113+
runs-on: ubuntu-latest
114+
needs: test # only run if regular tests pass
115+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main' # only on PRs
116+
env:
117+
TEST_ENV: 'production'
118+
119+
services:
120+
redis:
121+
image: 'redis:8.0.1'
122+
# Set health checks to wait until redis has started
123+
options: >-
124+
--health-cmd "redis-cli ping"
125+
--health-interval 10s
126+
--health-timeout 5s
127+
--health-retries 5
128+
ports:
129+
# Maps port 6379 on service container to the host
130+
- 6379:6379
131+
132+
steps:
133+
- uses: actions/checkout@v4
134+
135+
- name: Install Node
136+
uses: actions/setup-node@v4
137+
with:
138+
node-version: 22
139+
140+
- name: NPM Install
141+
uses: bahmutov/npm-install@v1
142+
with:
143+
useLockFile: false
144+
145+
- name: Setup on Redis
146+
env:
147+
SETUP: >-
148+
{
149+
"url": "http://127.0.0.1:4567/forum",
150+
"secret": "abcdef",
151+
"admin:username": "admin",
152+
"admin:email": "test@example.org",
153+
"admin:password": "hAN3Eg8W",
154+
"admin:password:confirm": "hAN3Eg8W",
155+
156+
"database": "redis",
157+
"redis:host": "127.0.0.1",
158+
"redis:port": 6379,
159+
"redis:password": "",
160+
"redis:database": 0
161+
}
162+
CI: >-
163+
{
164+
"host": "127.0.0.1",
165+
"database": 1,
166+
"port": 6379
167+
}
168+
MAILGUN_API_KEY: ${{ secrets.MAILGUN_API_KEY }}
169+
MAILGUN_DOMAIN: ${{ secrets.MAILGUN_DOMAIN }}
170+
run: |
171+
node app --setup="${SETUP}" --ci="${CI}"
172+
173+
# add test_database to config.json
174+
- name: Add test_database to config.json
175+
run: |
176+
test -f config.json || echo '{}' > config.json
177+
jq '. + {
178+
"test_database": {
179+
"host": "127.0.0.1",
180+
"port": 6379,
181+
"password": "",
182+
"database": 1
183+
}
184+
}' config.json > config.json.tmp && mv config.json.tmp config.json
185+
echo "✅ Injected test_database into config.json:"
186+
cat config.json
187+
188+
- name: Copy config into Stryker sandboxes
189+
run: |
190+
mkdir -p .stryker-tmp
191+
find .stryker-tmp -type d -name "sandbox-*" -exec cp config.json {}/config.json \; || true
192+
193+
- name: Run Stryker Mutation Testing
194+
env:
195+
NODE_ENV: test
196+
REDIS_HOST: 127.0.0.1
197+
REDIS_PORT: 6379
198+
run: |
199+
echo "Running Stryker mutation tests with Mocha runner..."
200+
rm -f .stryker-incremental.json
201+
npx stryker run
202+
SCORE=$(jq -r '.mutationScore' reports/mutation/mutation.json 2>/dev/null || echo "0")
203+
echo "SCORE=$SCORE" >> $GITHUB_ENV
204+
205+
- name: Upload mutation report artifact
206+
uses: actions/upload-artifact@v4
207+
with:
208+
name: mutation-report
209+
path: reports/mutation

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,8 @@ test.sh
8181
.env
8282
/build/
8383
/build/!export
84+
85+
# stryker temp files
86+
.stryker-tmp
87+
.stryker-incremental.json
88+
reports/mutation/**

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,16 @@
166166
"@commitlint/cli": "19.8.1",
167167
"@commitlint/config-angular": "19.8.1",
168168
"@eslint/js": "9.26.0",
169+
"@stryker-mutator/mocha-runner": "^9.2.0",
169170
"@stylistic/eslint-plugin-js": "4.4.0",
170171
"coveralls": "3.1.1",
171172
"eslint-config-nodebb": "1.1.5",
172173
"eslint-plugin-import": "2.31.0",
173174
"grunt": "1.6.1",
174175
"grunt-contrib-watch": "1.1.0",
175176
"husky": "8.0.3",
176-
"jsdom": "26.1.0",
177+
"jsdom": "^26.1.0",
178+
"jsdom-global": "^3.0.2",
177179
"lint-staged": "16.0.0",
178180
"mocha": "11.2.2",
179181
"mocha-lcov-reporter": "1.3.0",

‎src/cli/index.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
const fs = require('fs');
44
const path = require('path');
55

6-
require('../../require-main');
6+
try {
7+
require('../../require-main');
8+
} catch (err) {
9+
require('../../test/mocks/require-main-polyfill');
10+
}
711

812
const packageInstall = require('./package-install');
913
const { paths } = require('../constants');

‎src/controllers/admin/plugins.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ pluginsController.get = async function (req, res) {
3232
});
3333

3434
const upgrade = compatible.filter(p => p.installed && p.outdated);
35+
36+
upgrade.forEach((p) => {
37+
if (!p.url) {
38+
p.url = `https://www.npmjs.com/package/${p.name}`;
39+
}
40+
});
41+
3542
res.render('admin/extend/plugins', {
3643
installed: installedPlugins,
3744
installedCount: installedPlugins.length,

‎src/emailer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const file = require('./file');
2323
const viewsDir = nconf.get('views_dir');
2424
const Emailer = module.exports;
2525

26+
2627
// custom plugin code to send emails via Mailgun API
2728
const mailgunSender = require('../nodebb-plugin-mailgun-delivery/library.js');
2829

@@ -446,4 +447,4 @@ Emailer.renderAndTranslate = async (template, params, lang) => {
446447
return await translator.translate(html, lang);
447448
};
448449

449-
require('./promisify')(Emailer, ['transports']);
450+
require('./promisify')(Emailer, ['transports']);

‎src/meta/build.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
const os = require('os');
44
const winston = require('winston');
5+
56
const nconf = require('nconf');
67
const _ = require('lodash');
78
const path = require('path');

‎src/start.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ const start = module.exports;
88
start.start = async function () {
99
printStartupInfo();
1010

11+
// Skip heavy startup during Stryker sandbox runs
12+
if (process.env.STRYKER_MUTATOR) {
13+
winston.warn('[Stryker sandbox] Skipping full NodeBB startup (webserver, sockets, plugins, jobs)');
14+
return; // exit early so Stryker doesn't hang
15+
}
16+
1117
addProcessHandlers();
1218

1319
try {

‎stryker.config.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"$schema": "./node_modules/@stryker-mutator/core/schema/stryker-schema.json",
3+
"packageManager": "npm",
4+
"reporters": ["clear-text", "progress", "html", "json"],
5+
6+
"testRunner": "mocha",
7+
"mochaOptions": {
8+
"spec": ["test/categories.js"]
9+
},
10+
11+
"mutate": ["src/categories/create.js","src/categories/delete.js"],
12+
13+
"ignorePatterns": [
14+
"node_modules/**",
15+
".stryker-tmp/**",
16+
"require-main.js",
17+
".nyc_output/**",
18+
"coverage/**",
19+
"logs/**",
20+
"build/public/plugins/**",
21+
"build/public/uploads/**"
22+
],
23+
"thresholds": {
24+
"high": 80,
25+
"low": 60,
26+
"break": 50
27+
},
28+
"incremental": true,
29+
"incrementalFile": ".stryker-incremental.json",
30+
"coverageAnalysis": "perTest",
31+
"timeoutMS": 90000,
32+
"timeoutFactor": 1.5,
33+
"concurrency": 6
34+
}

‎test/api.js‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ const activitypub = require('../src/activitypub');
2727
const utils = require('../src/utils');
2828
const api = require('../src/api');
2929

30+
// CI-specific stubs to prevent hanging ActivityPub network calls
31+
if (process.env.CI) {
32+
console.log('[CI] Stubbing ActivityPub follow/unfollow to prevent hangs');
33+
const api = require('../src/api');
34+
api.activitypub.follow = async () => '[stubbed follow]';
35+
api.activitypub.unfollow = async () => '[stubbed unfollow]';
36+
}
37+
3038
describe('API', async () => {
3139
let readApi = false;
3240
let writeApi = false;
@@ -522,15 +530,19 @@ describe('API', async () => {
522530
}
523531
});
524532

525-
it('response status code should match one of the schema defined responses', () => {
533+
// Skip this test under Stryker, since sandbox environment breaks export endpoint
534+
(process.env.STRYKER_MUTATOR ? it.skip : it)(
535+
'response status code should match one of the schema defined responses',
536+
() => {
526537
// HACK: allow HTTP 418 I am a teapot, for now 👇
527-
const { responses } = context[method];
528-
assert(
529-
responses.hasOwnProperty('418') ||
530-
Object.keys(responses).includes(String(result.response.statusCode)),
531-
`${method.toUpperCase()} ${path} sent back unexpected HTTP status code: ${result.response.statusCode}`
532-
);
533-
});
538+
const { responses } = context[method];
539+
assert(
540+
responses.hasOwnProperty('418') ||
541+
Object.keys(responses).includes(String(result.response.statusCode)),
542+
`${method.toUpperCase()} ${path} sent back unexpected HTTP status code: ${result.response.statusCode}`
543+
);
544+
}
545+
);
534546

535547
// Recursively iterate through schema properties, comparing type
536548
it('response body should match schema definition', () => {

0 commit comments

Comments
 (0)