-
Notifications
You must be signed in to change notification settings - Fork 789
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
chore: modernized rule generator #4106
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,4 +1,5 @@ | ||||||
const directories = require('./directories'); | ||||||
const outdent = require('outdent'); | ||||||
|
||||||
/** | ||||||
* Helper to convert a given string to camel case (split by hyphens if any) | ||||||
|
@@ -23,8 +24,8 @@ const getRuleSpecFileMeta = (ruleName, ruleHasMatches, ruleChecks) => { | |||||
name: `${ruleName}.json`, | ||||||
content: JSON.stringify( | ||||||
{ | ||||||
id: `${ruleName}`, | ||||||
selector: '', | ||||||
id: ruleName, | ||||||
selector: '*', | ||||||
...(ruleHasMatches && { | ||||||
matches: `${ruleName}-matches` | ||||||
}), | ||||||
|
@@ -70,15 +71,13 @@ const getRuleMatchesFileMeta = ( | |||||
const fnName = `${camelCase(ruleName)}Matches`; | ||||||
const ruleMatchesJs = { | ||||||
name: `${ruleName}-matches.js`, | ||||||
content: ` | ||||||
// TODO: Filter node(s) | ||||||
|
||||||
function ${fnName}(node, virtualNode) { | ||||||
return node | ||||||
} | ||||||
content: outdent` | ||||||
// TODO: Filter node(s) | ||||||
|
||||||
export default ${fnName} | ||||||
`, | ||||||
export default function ${fnName}(node, virtualNode) { | ||||||
return true; | ||||||
} | ||||||
`, | ||||||
dir: directories.rules | ||||||
}; | ||||||
files.push(ruleMatchesJs); | ||||||
|
@@ -87,11 +86,17 @@ const getRuleMatchesFileMeta = ( | |||||
if (ruleHasUnitTestAssets) { | ||||||
const ruleMatchesTestJs = { | ||||||
name: `${ruleName}-matches.js`, | ||||||
content: ` | ||||||
describe('${ruleName}-matches', function() { | ||||||
'use strict'; | ||||||
// TODO: Write tests | ||||||
}) | ||||||
content: outdent` | ||||||
describe('${ruleName}-matches', () => { | ||||||
const rule = axe.utils.getRule('${ruleName}'); | ||||||
const { queryFixture } = axe.testUtils; | ||||||
|
||||||
// TODO: Replace with real tests | ||||||
it('returns false for paragraphs', () => { | ||||||
const vNode = queryFixture('<p id="target">Hello world</p>'); | ||||||
assert.isFalse(rule.matches(vNode.actualNode, vNode)); | ||||||
}); | ||||||
}); | ||||||
`, | ||||||
dir: directories.testRuleMatches | ||||||
}; | ||||||
|
@@ -142,13 +147,12 @@ const getCheckJsFileMeta = (name, dir) => { | |||||
const fnName = `${camelCase(name)}Evaluate`; | ||||||
return { | ||||||
name: `${name}-evaluate.js`, | ||||||
content: ` | ||||||
// TODO: Logic for check | ||||||
function ${fnName}(node, options, virtualNode) { | ||||||
return true | ||||||
} | ||||||
export default ${fnName}; | ||||||
`, | ||||||
content: outdent` | ||||||
// TODO: Logic for check | ||||||
export default function ${fnName}(node, options, virtualNode) { | ||||||
return true | ||||||
} | ||||||
`, | ||||||
dir | ||||||
}; | ||||||
}; | ||||||
|
@@ -163,12 +167,24 @@ const getCheckJsFileMeta = (name, dir) => { | |||||
const getCheckTestJsFileMeta = (name, dir) => { | ||||||
return { | ||||||
name: `${name}.js`, | ||||||
content: ` | ||||||
describe('${name} tests', function() { | ||||||
'use strict'; | ||||||
// TODO: Write tests | ||||||
}) | ||||||
`, | ||||||
content: outdent` | ||||||
describe('${name} tests', () => { | ||||||
const { checkSetup, getCheckEvaluate } = axe.testUtils; | ||||||
const checkContext = axe.testUtils.MockCheckContext(); | ||||||
const checkEvaluate = getCheckEvaluate('${name}'); | ||||||
|
||||||
afterEach(() => { | ||||||
checkContext.reset(); | ||||||
}); | ||||||
|
||||||
// TODO: Replace this with real tests for this check | ||||||
it('returns false when img has no alt', () => { | ||||||
const args = checkSetup('<img id="target" />'); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
assert.isFalse(checkEvaluate.apply(checkContext, params)); | ||||||
assert.deepEqual(checkContext._data, { messageKey: 'missing-alt' }); | ||||||
}); | ||||||
}); | ||||||
`, | ||||||
dir | ||||||
}; | ||||||
}; | ||||||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.