Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions build/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Additional global variables your script accesses during execution
"globals": {
"Joomla": true,
"MediaManager" : true,
"MediaManager": true,
"bootstrap": true
},
// Rule overrides
Expand Down Expand Up @@ -52,24 +52,24 @@
]
},
"overrides": [
{
"files": ["tests/**/*.js"],
"rules": {
"no-undef": ["off"],
"import/no-extraneous-dependencies": ["off"]
}
},
{
"files": ["tests/System/support/index.js"],
"rules": {
"no-console": ["off"]
}
},
{
"files": ["tests/System/support/commands/db.js","tests/System/plugins/index.js"],
"rules": {
"no-useless-escape": ["off"]
}
}
{
"files": ["tests/**/*.js", "tests/**/*.mjs"],
"rules": {
"no-undef": ["off"],
"import/no-extraneous-dependencies": ["off"]
}
},
{
"files": ["tests/System/support/index.js"],
"rules": {
"no-console": ["off"]
}
},
{
"files": ["tests/System/support/commands/db.mjs"],
"rules": {
"no-useless-escape": ["off"]
}
}
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"watch": "node build/build.js --watch",
"watch:com_media": "node build/build.js --watch-com-media",
"lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .es6.js,.es6,.vue .",
"lint:testjs": "eslint --config build/.eslintrc --ext .js tests/System",
"lint:testjs": "eslint --config build/.eslintrc --ext .js,.mjs tests/System",
"lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
"install": "node build/build.js --prepare",
"update": "node build/build.js --copy-assets && node build/build.js --build-pages && node build/build.js --compile-js && node build/build.js --compile-css && node build/build.js --compile-bs && node --env-file=./build/production.env build/build.js --com-media",
Expand Down
1 change: 0 additions & 1 deletion tests/System/plugins/db.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ function queryTestDB(joomlaQuery, config) {

// Do we use PostgreSQL?
if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {

if (postgresConnectionPool === null) {
// Initialisation on the first call
postgresConnectionPool = postgres({
Expand Down
6 changes: 4 additions & 2 deletions tests/System/plugins/fs.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { chmodSync, existsSync, writeFileSync, mkdirSync, rmSync } from "fs";
import { dirname, join } from "path";
import {
chmodSync, existsSync, writeFileSync, mkdirSync, rmSync,
} from 'fs';
import { dirname, join } from 'path';
import { umask } from 'node:process';

/**
Expand Down
7 changes: 3 additions & 4 deletions tests/System/plugins/index.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getMails, clearEmails, startMailServer } from "./mail.mjs";
import { writeRelativeFile, deleteRelativePath } from "./fs.mjs";
import { queryTestDB, deleteInsertedItems } from "./db.mjs";
import { getMails, clearEmails, startMailServer } from './mail.mjs';
import { writeRelativeFile, deleteRelativePath } from './fs.mjs';
import { queryTestDB, deleteInsertedItems } from './db.mjs';

/**
* Does the setup of the plugins.
Expand All @@ -21,4 +21,3 @@ export default function setupPlugins(on, config) {
startMailServer: () => startMailServer(config),
});
}