From b9b3e54c9ea78cfebed65281284e00c679451787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Ren=C3=A9e=20Beach?= Date: Sat, 12 Aug 2023 21:37:42 -0700 Subject: [PATCH] Remove the attribute information from the DisclosureTriangle concept --- __tests__/src/AXObjectElementMap-test.js | 4 ++-- __tests__/src/AXObjectsMap-test.js | 4 ++-- __tests__/src/elementAXObjectMap-test.js | 8 +++----- scripts/axmodel.json | 20 -------------------- src/etc/objects/DisclosureTriangleRole.js | 20 -------------------- 5 files changed, 7 insertions(+), 49 deletions(-) diff --git a/__tests__/src/AXObjectElementMap-test.js b/__tests__/src/AXObjectElementMap-test.js index 8ff22bd..40791b6 100644 --- a/__tests__/src/AXObjectElementMap-test.js +++ b/__tests__/src/AXObjectElementMap-test.js @@ -24,7 +24,7 @@ const entriesList = [ ["DetailsRole", [{"name": "details"}]], ["DialogRole", [{"name": "dialog"}]], ["DirectoryRole", [{"name": "dir"}]], - ["DisclosureTriangleRole", [{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, {"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}]], + ["DisclosureTriangleRole", [{"constraints": ["scoped to a details element"], "name": "summary"}]], ["DivRole", [{"name": "div"}]], ["EmbeddedObjectRole", [{"name": "embed"}]], ["FigcaptionRole", [{"name": "figcaption"}]], @@ -152,7 +152,7 @@ describe('AXObjectElementMap', function () { expect(AXObjectElementMap.get("DetailsRole")).toEqual([{"name": "details"}]); expect(AXObjectElementMap.get("DialogRole")).toEqual([{"name": "dialog"}]); expect(AXObjectElementMap.get("DirectoryRole")).toEqual([{"name": "dir"}]); - expect(AXObjectElementMap.get("DisclosureTriangleRole")).toEqual([{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, {"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}]); + expect(AXObjectElementMap.get("DisclosureTriangleRole")).toEqual([{"constraints": ["scoped to a details element"], "name": "summary"}]); expect(AXObjectElementMap.get("DivRole")).toEqual([{"name": "div"}]); expect(AXObjectElementMap.get("EmbeddedObjectRole")).toEqual([{"name": "embed"}]); expect(AXObjectElementMap.get("FigcaptionRole")).toEqual([{"name": "figcaption"}]); diff --git a/__tests__/src/AXObjectsMap-test.js b/__tests__/src/AXObjectsMap-test.js index ac46088..8434ff4 100644 --- a/__tests__/src/AXObjectsMap-test.js +++ b/__tests__/src/AXObjectsMap-test.js @@ -33,7 +33,7 @@ const entriesList = [ ["DetailsRole", expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'details',},},],type: 'structure',})], ["DialogRole", expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'dialog',},},{module: 'HTML',concept: {name: 'dialog',},},],type: 'window',})], ["DirectoryRole", expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'directory',},},{module: 'HTML',concept: {name: 'dir',},},],type: 'structure',})], - ["DisclosureTriangleRole", expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {attributes: [{name: 'open',value: 'open',},],constraints: ['scoped to a details element',],name: 'summary',},},{module: 'HTML',concept: {attributes: [{name: 'aria-expanded',},],constraints: ['scoped to a details element',],name: 'summary',},},],type: 'widget',})], + ["DisclosureTriangleRole", expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {constraints: ['scoped to a details element',],name: 'summary',},},],type: 'widget',})], ["DivRole", expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'div',},},],type: 'generic',})], ["DocumentRole", expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'document',},},],type: 'structure',})], ["EmbeddedObjectRole", expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'embed',},},],type: 'widget',})], @@ -220,7 +220,7 @@ describe('AXObjectsMap', function () { expect(AXObjectsMap.get("DetailsRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'details',},},],type: 'structure',}),); expect(AXObjectsMap.get("DialogRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'dialog',},},{module: 'HTML',concept: {name: 'dialog',},},],type: 'window',}),); expect(AXObjectsMap.get("DirectoryRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'directory',},},{module: 'HTML',concept: {name: 'dir',},},],type: 'structure',}),); - expect(AXObjectsMap.get("DisclosureTriangleRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {attributes: [{name: 'open',value: 'open',},],constraints: ['scoped to a details element',],name: 'summary',},},{module: 'HTML',concept: {attributes: [{name: 'aria-expanded',},],constraints: ['scoped to a details element',],name: 'summary',},},],type: 'widget',}),); + expect(AXObjectsMap.get("DisclosureTriangleRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {constraints: ['scoped to a details element',],name: 'summary',},},],type: 'widget',}),); expect(AXObjectsMap.get("DivRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'div',},},],type: 'generic',}),); expect(AXObjectsMap.get("DocumentRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'ARIA',concept: {name: 'document',},},],type: 'structure',}),); expect(AXObjectsMap.get("EmbeddedObjectRole")).toEqual(expect.objectContaining({relatedConcepts: [{module: 'HTML',concept: {name: 'embed',},},],type: 'widget',}),); diff --git a/__tests__/src/elementAXObjectMap-test.js b/__tests__/src/elementAXObjectMap-test.js index 480bc09..bfb64a2 100644 --- a/__tests__/src/elementAXObjectMap-test.js +++ b/__tests__/src/elementAXObjectMap-test.js @@ -24,8 +24,7 @@ const entriesList = [ [{"name": "details"}, ["DetailsRole"]], [{"name": "dialog"}, ["DialogRole"]], [{"name": "dir"}, ["DirectoryRole"]], - [{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]], - [{"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]], + [{"constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]], [{"name": "div"}, ["DivRole"]], [{"name": "embed"}, ["EmbeddedObjectRole"]], [{"name": "figcaption"}, ["FigcaptionRole"]], @@ -85,7 +84,7 @@ describe('elementAXObjectMap', function () { expect(elementAXObjectMap[Symbol.iterator]).toBeDefined(); }); it('should have a specific length', function () { - expect([...elementAXObjectMap].length).toEqual(71); + expect([...elementAXObjectMap].length).toEqual(70); }); describe('should support the spread operator', function () { test.each([...elementAXObjectMap])(`Testing role: '%s' with element %o`, (role, elements) => { @@ -167,8 +166,7 @@ describe('elementAXObjectMap', function () { expect(elementAXObjectMap.get({"name": "details"})).toEqual(["DetailsRole"]); expect(elementAXObjectMap.get({"name": "dialog"})).toEqual(["DialogRole"]); expect(elementAXObjectMap.get({"name": "dir"})).toEqual(["DirectoryRole"]); - expect(elementAXObjectMap.get({"attributes": [{"name": "open", "value": "open"}], "name": "summary"})).toEqual(["DisclosureTriangleRole"]), - expect(elementAXObjectMap.get({"attributes": [{"name": "aria-expanded"}], "name": "summary"})).toEqual(["DisclosureTriangleRole"]), + expect(elementAXObjectMap.get({"constraints": ["scoped to a details element"], "name": "summary"})).toEqual(["DisclosureTriangleRole"]), expect(elementAXObjectMap.get({"name": "div"})).toEqual(["DivRole"]); expect(elementAXObjectMap.get({"name": "embed"})).toEqual(["EmbeddedObjectRole"]); expect(elementAXObjectMap.get({"name": "figcaption"})).toEqual(["FigcaptionRole"]); diff --git a/scripts/axmodel.json b/scripts/axmodel.json index 9d9baf4..36615af 100644 --- a/scripts/axmodel.json +++ b/scripts/axmodel.json @@ -390,26 +390,6 @@ { "module": "HTML", "concept": { - "attributes": [ - { - "name": "open", - "value": "open" - } - ], - "constraints": [ - "scoped to a details element" - ], - "name": "summary" - } - }, - { - "module": "HTML", - "concept": { - "attributes": [ - { - "name": "aria-expanded" - } - ], "constraints": [ "scoped to a details element" ], diff --git a/src/etc/objects/DisclosureTriangleRole.js b/src/etc/objects/DisclosureTriangleRole.js index bbffa17..be9d28e 100644 --- a/src/etc/objects/DisclosureTriangleRole.js +++ b/src/etc/objects/DisclosureTriangleRole.js @@ -6,26 +6,6 @@ const DisclosureTriangleRole: AXObjectModelDefinition = { { module: 'HTML', concept: { - attributes: [ - { - name: 'open', - value: 'open', - }, - ], - constraints: [ - 'scoped to a details element', - ], - name: 'summary', - }, - }, - { - module: 'HTML', - concept: { - attributes: [ - { - name: 'aria-expanded', - }, - ], constraints: [ 'scoped to a details element', ],