[orca] Look in the child for the first caret context of internal frames



commit 6f7ddb2440a382ba267ab00bbe4e4ec97b1652f8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Sep 3 17:02:33 2015 -0400

    Look in the child for the first caret context of internal frames

 src/orca/scripts/web/script_utilities.py           |    1 +
 test/keystrokes/firefox/line_nav_iframes_nested.py |   19 +++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index 0a55e6f..5b77f54 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -2279,6 +2279,7 @@ class Utilities(script_utilities.Utilities):
             return None, -1
 
         lookInChild = [pyatspi.ROLE_LIST,
+                       pyatspi.ROLE_INTERNAL_FRAME,
                        pyatspi.ROLE_TABLE,
                        pyatspi.ROLE_TABLE_ROW]
         if role in lookInChild and obj.childCount:
diff --git a/test/keystrokes/firefox/line_nav_iframes_nested.py 
b/test/keystrokes/firefox/line_nav_iframes_nested.py
index 0df3950..48612df 100644
--- a/test/keystrokes/firefox/line_nav_iframes_nested.py
+++ b/test/keystrokes/firefox/line_nav_iframes_nested.py
@@ -15,13 +15,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button internal frame'",
+    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button '",
      "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
      "BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+'",
      "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
      "SPEECH OUTPUT: 'Click here to publicly \+1 this. push button'",
-     "SPEECH OUTPUT: '[0-9]+'",
-     "SPEECH OUTPUT: 'internal frame'"]))
+     "SPEECH OUTPUT: '[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -35,22 +34,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "3. Top of file",
-    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+ internal frame'",
+    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+'",
      "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
      "SPEECH OUTPUT: 'Click here to publicly \+1 this. push button'",
-     "SPEECH OUTPUT: '[0-9]+'",
-     "SPEECH OUTPUT: 'internal frame'"]))
+     "SPEECH OUTPUT: '[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["KNOWN ISSUE: We are stuck on the internal iframe",
-     "BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+ internal frame'",
-     "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
-     "SPEECH OUTPUT: 'Click here to publicly \+1 this. push button'",
-     "SPEECH OUTPUT: '[0-9]+'",
-     "SPEECH OUTPUT: 'internal frame'"]))
+    ["BRAILLE LINE:  'After the iframe'",
+     "     VISIBLE:  'After the iframe', cursor=1",
+     "SPEECH OUTPUT: 'After the iframe'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]