Skip to content

Support resources/ folder being moved on w3c/aria-at for tests import #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: development
Choose a base branch
from
Draft

Support resources/ folder being moved on w3c/aria-at for tests import #1207

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e475b
Account for resources folder being moved on w3c/aria-at
howard-e Aug 29, 2024
0a54560
Support dynamic <ROOT>/resources and <ROOT>/tests/resources folder
howard-e Sep 3, 2024
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
2 changes: 1 addition & 1 deletion server/scripts/import-tests/gitOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const spawn = require('cross-spawn');

const ariaAtRepo = 'https://github.com/w3c/aria-at.git';
const ariaAtDefaultBranch = 'master';
const ariaAtDefaultBranch = 'move-resources'; // TODO: Revert to 'master' before merging
Copy link
Contributor

@stalgiag stalgiag Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Placing another reminder to change this before merging

Copy link
Contributor

@stalgiag stalgiag Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or actually I realize now that this is using the aria-at branch that should make this build over here. Perhaps the issues with CI point to a larger issue with the paths?

Copy link
Contributor Author

@howard-e howard-e Sep 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also wondering that too. Will investigate

Copy link
Contributor Author

@howard-e howard-e Sep 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be fixed now in 0a54560


/**
* Executes a git command and returns its output.
Expand Down
8 changes: 7 additions & 1 deletion server/scripts/import-tests/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@ const path = require('path');
const gitCloneDirectory = path.resolve(__dirname, 'tmp');
const builtTestsDirectory = path.resolve(gitCloneDirectory, 'build', 'tests');
const testsDirectory = path.resolve(gitCloneDirectory, 'tests');
const resourcesDirectory = path.resolve(gitCloneDirectory, 'resources');

module.exports = { gitCloneDirectory, builtTestsDirectory, testsDirectory };
module.exports = {
gitCloneDirectory,
builtTestsDirectory,
testsDirectory,
resourcesDirectory
};
11 changes: 4 additions & 7 deletions server/scripts/import-tests/testPlanVersionOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const { parseTests } = require('./testParser');
const {
gitCloneDirectory,
builtTestsDirectory,
testsDirectory
testsDirectory,
resourcesDirectory
} = require('./settings');
const { getAppUrl } = require('./utils');

Expand Down Expand Up @@ -66,8 +67,6 @@ const buildTestsAndCreateTestPlanVersions = async (commit, { transaction }) => {
await updateAtsJson({ ats, supportAts: support.ats });

for (const directory of fse.readdirSync(builtTestsDirectory)) {
if (directory === 'resources') continue;

const builtDirectoryPath = path.join(builtTestsDirectory, directory);
const sourceDirectoryPath = path.join(testsDirectory, directory);

Expand Down Expand Up @@ -235,7 +234,7 @@ const processTestPlanVersion = async ({
* Imports the harness files from the test directory to the client resources.
*/
const importHarness = () => {
const sourceFolder = path.resolve(`${testsDirectory}/resources`);
const sourceFolder = path.resolve(`${resourcesDirectory}`);
const targetFolder = path.resolve('../', 'client/resources');
console.info(`Updating harness directory, ${targetFolder} ...`);
fse.rmSync(targetFolder, { recursive: true, force: true });
Expand Down Expand Up @@ -330,9 +329,7 @@ const flattenObject = (obj, parentKey = '') => {
*/
const updateJsons = async () => {
// Commands path info for v1 format
const keysMjsPath = pathToFileURL(
path.join(testsDirectory, 'resources', 'keys.mjs')
);
const keysMjsPath = pathToFileURL(path.join(resourcesDirectory, 'keys.mjs'));
const commands = Object.entries(await import(keysMjsPath)).map(
([id, text]) => ({ id, text })
);
Expand Down