Skip to content
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.

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

Add support in import test script for importing test harness #1064

Merged
merged 6 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,5 @@ server/migrations/test_plan_target_id.csv

# Private Key files (installed by deploy)
jwt-signing-key.pem

client/resources
Copy link
Contributor

@howard-e howard-e Apr 29, 2024

Choose a reason for hiding this comment

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

Since there are still updates to client/resources in this PR, you'll also need to untrack client/resources by doing: git rm -r --cached client/resources, and push again afterwards.

Although, I am now wondering if this should need to be done? It will require that contributors be somewhat aware of when last changes to the w3c/aria-at files have happened so they may re-run the import script locally. Otherwise there could be confusion if some w3c/aria-at-dependent operations aren't working as expected if the client application's files are updated but not the now ignored aria-at harness changes.

My above concern is relatively minor though and seems like a docs/local-development.md update could be useful here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a brief notes in the docs.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good! After untracking the client/resources folder, this PR should be good to go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All set!

2 changes: 1 addition & 1 deletion client/resources/aria-at-test-io-format.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ export class TestRunInputOutput {
output: command.atOutput.value,
assertionResults: command.assertions.map(assertion => ({
assertion: {
priority: assertion.priority === 1 ? 'MUST' : 'SHOULD',
priority: assertion.priority === 1 ? 'REQUIRED' : 'OPTIONAL',
howard-e marked this conversation as resolved.
Show resolved Hide resolved
text: assertion.description,
},
passed: assertion.result === 'pass',
Expand Down
117 changes: 0 additions & 117 deletions client/resources/keys.json

This file was deleted.

28 changes: 28 additions & 0 deletions client/resources/support.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,34 @@
"Simultaneously press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd>.",
"If VoiceOver said 'quick nav on', press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd> again to turn it back off."
]
},
"arrowQuickKeyNavOn": {
"screenText": "arrow quick key nav on",
"instructions": [
"Simultaneously press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd>.",
"If VoiceOver said 'arrow quick key nav off', press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd> again to turn it back on."
]
},
"arrowQuickKeyNavOff": {
"screenText": "arrow quick key nav off",
"instructions": [
"Simultaneously press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd>.",
"If VoiceOver said 'arrow quick key nav on', press <kbd>Left Arrow</kbd> and <kbd>Right Arrow</kbd> again to turn it back off."
]
},
"singleQuickKeyNavOn": {
"screenText": "single quick key nav on",
"instructions": [
"Press <kbd>Control</kbd>+<kbd>Option</kbd>+<kbd>q</kbd>.",
"If VoiceOver said 'single quick key nav off', press <kbd>Control</kbd>+<kbd>Option</kbd>+<kbd>q</kbd> again to turn it back on."
]
},
"singleQuickKeyNavOff": {
"screenText": "single quick key nav off",
"instructions": [
"Press <kbd>Control</kbd>+<kbd>Option</kbd>+<kbd>q</kbd>.",
"If VoiceOver said 'single quick key nav on', press <kbd>Control</kbd>+<kbd>Option</kbd>+<kbd>q</kbd> again to turn it back off."
]
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions client/resources/types/aria-at-test-result.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/

/**
* @typedef {"MUST"
* | "SHOULD"} AriaATTestResult.AssertionPriorityJSON
* @typedef {"REQUIRED"
* | "OPTIONAL"} AriaATTestResult.AssertionPriorityJSON
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion server/migrations/20211116172219-commandSequences.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { omit } = require('lodash');
const { TestPlanVersion } = require('../models');
const commandList = require('../resources/commands.json');
const commandList = require('../resources/commandsV1.json');

module.exports = {
up: async queryInterface => {
Expand Down
2 changes: 1 addition & 1 deletion server/resolvers/helpers/retrieveCommands.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const commands = require('../../resources/commands.json');
const commands = require('../../resources/commandsV1.json');
const commandsV2 = require('../../resources/commandsV2.json');
evmiguel marked this conversation as resolved.
Show resolved Hide resolved

function findValueByKey(keyMappings, keyToFindText) {
Expand Down
Loading
Loading