Skip to content

Commit 8e88baa

Browse files
yaira2yaira2
committed
Test
1 parent be2c577 commit 8e88baa

File tree

9 files changed

+42
-21
lines changed

9 files changed

+42
-21
lines changed

‎src/Files.App/Views/Settings/AboutPage.xaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
<!-- GitHub Sponsor -->
5252
<wctcontrols:SettingsCard
53+
AutomationProperties.AccessibilityView="Raw"
5354
Command="{x:Bind ViewModel.SupportUsCommand}"
5455
Header="{helpers:ResourceString Name=SponsorUsOnGitHub}"
5556
IsClickEnabled="True">
@@ -73,6 +74,7 @@
7374
<!-- Documentation -->
7475
<wctcontrols:SettingsCard
7576
HorizontalAlignment="Stretch"
77+
AutomationProperties.AccessibilityView="Raw"
7678
Command="{x:Bind ViewModel.OpenDocumentationCommand}"
7779
Header="{helpers:ResourceString Name=Documentation}"
7880
IsClickEnabled="True">
@@ -88,6 +90,7 @@
8890
<!-- Questions & discussions -->
8991
<wctcontrols:SettingsCard
9092
HorizontalAlignment="Stretch"
93+
AutomationProperties.AccessibilityView="Raw"
9194
Command="{x:Bind ViewModel.OpenDiscordCommand}"
9295
Header="{helpers:ResourceString Name=QuestionsAndDiscussions}"
9396
IsClickEnabled="True">
@@ -101,14 +104,15 @@
101104
</wctcontrols:SettingsCard>
102105

103106
<!-- Feedback -->
104-
<wctcontrols:SettingsExpander HorizontalAlignment="Stretch" Header="{helpers:ResourceString Name=Feedback}">
107+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Feedback}">
105108
<wctcontrols:SettingsExpander.HeaderIcon>
106109
<FontIcon Glyph="&#xED15;" />
107110
</wctcontrols:SettingsExpander.HeaderIcon>
108111
<wctcontrols:SettingsExpander.Items>
109112
<!-- Submit feature request -->
110113
<wctcontrols:SettingsCard
111114
HorizontalAlignment="Stretch"
115+
AutomationProperties.AccessibilityView="Raw"
112116
Command="{x:Bind ViewModel.SubmitFeatureRequestCommand}"
113117
Header="{helpers:ResourceString Name=SubmitFeatureRequest}"
114118
IsClickEnabled="True">
@@ -120,6 +124,7 @@
120124
<!-- Submit bug report -->
121125
<wctcontrols:SettingsCard
122126
HorizontalAlignment="Stretch"
127+
AutomationProperties.AccessibilityView="Raw"
123128
Command="{x:Bind ViewModel.SubmitBugReportCommand}"
124129
Header="{helpers:ResourceString Name=SubmitBugReport}"
125130
IsClickEnabled="True">
@@ -133,6 +138,7 @@
133138
<!-- Open Log File Location -->
134139
<wctcontrols:SettingsCard
135140
HorizontalAlignment="Stretch"
141+
AutomationProperties.AccessibilityView="Raw"
136142
Command="{x:Bind ViewModel.OpenLogLocationCommand}"
137143
Header="{helpers:ResourceString Name=OpenLogLocation}"
138144
IsClickEnabled="True">
@@ -156,6 +162,7 @@
156162
<!-- Translate -->
157163
<wctcontrols:SettingsCard
158164
HorizontalAlignment="Stretch"
165+
AutomationProperties.AccessibilityView="Raw"
159166
Command="{x:Bind ViewModel.OpenCrowdinCommand}"
160167
Header="{helpers:ResourceString Name=ImproveTranslation}"
161168
IsClickEnabled="True">
@@ -169,7 +176,7 @@
169176
</wctcontrols:SettingsCard>
170177

171178
<!-- Third Party Licenses -->
172-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=ThirdPartyLibraries}">
179+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=ThirdPartyLibraries}">
173180
<wctcontrols:SettingsExpander.HeaderIcon>
174181
<FontIcon Glyph="&#xE90F;" />
175182
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -202,6 +209,7 @@
202209
<!-- Open GitHub repo -->
203210
<wctcontrols:SettingsCard
204211
HorizontalAlignment="Stretch"
212+
AutomationProperties.AccessibilityView="Raw"
205213
Command="{x:Bind ViewModel.OpenGitHubRepoCommand}"
206214
Header="{helpers:ResourceString Name=OpenGitHubRepo}"
207215
IsClickEnabled="True">
@@ -217,6 +225,7 @@
217225
<!-- Privacy -->
218226
<wctcontrols:SettingsCard
219227
HorizontalAlignment="Stretch"
228+
AutomationProperties.AccessibilityView="Raw"
220229
Command="{x:Bind ViewModel.OpenPrivacyPolicyCommand}"
221230
Header="{helpers:ResourceString Name=Privacy}"
222231
IsClickEnabled="True">

‎src/Files.App/Views/Settings/AdvancedPage.xaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
<!-- Export -->
3939
<wctcontrols:SettingsCard
40+
AutomationProperties.AccessibilityView="Raw"
4041
Command="{x:Bind ViewModel.ExportSettingsCommand}"
4142
Header="{helpers:ResourceString Name=ExportSettings}"
4243
IsClickEnabled="True">
@@ -50,6 +51,7 @@
5051

5152
<!-- Import -->
5253
<wctcontrols:SettingsCard
54+
AutomationProperties.AccessibilityView="Raw"
5355
Command="{x:Bind ViewModel.ImportSettingsCommand}"
5456
Header="{helpers:ResourceString Name=ImportSettings}"
5557
IsClickEnabled="True">
@@ -63,6 +65,7 @@
6365

6466
<!-- Edit Settings File -->
6567
<wctcontrols:SettingsCard
68+
AutomationProperties.AccessibilityView="Raw"
6669
Command="{x:Bind ViewModel.OpenSettingsJsonCommand}"
6770
Header="{helpers:ResourceString Name=EditSettingsFile}"
6871
IsClickEnabled="True">
@@ -131,6 +134,7 @@
131134
<wctcontrols:SettingsCard
132135
x:Name="SetAsDefaultSettingsBlockControl"
133136
HorizontalAlignment="Stretch"
137+
AutomationProperties.AutomationControlType="Custom"
134138
Description="{helpers:ResourceString Name=SettingsSetAsDefaultFileManagerDescription}"
135139
Header="{helpers:ResourceString Name=SettingsSetAsDefaultFileManager}">
136140
<wctcontrols:SettingsCard.HeaderIcon>

‎src/Files.App/Views/Settings/AppearancePage.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<!-- App Background -->
121121
<wctcontrols:SettingsExpander
122122
HorizontalAlignment="Stretch"
123+
AutomationProperties.AutomationControlType="Custom"
123124
Header="{helpers:ResourceString Name=BackgroundColor}"
124125
IsExpanded="True">
125126
<wctcontrols:SettingsExpander.HeaderIcon>
@@ -165,6 +166,7 @@
165166
<!-- App Background Image -->
166167
<wctcontrols:SettingsExpander
167168
HorizontalAlignment="Stretch"
169+
AutomationProperties.AutomationControlType="Custom"
168170
Description="{x:Bind ViewModel.AppThemeBackgroundImageSource, Mode=OneWay}"
169171
Header="{helpers:ResourceString Name=BackgroundImage}"
170172
IsExpanded="False">
@@ -243,7 +245,7 @@
243245
</wctcontrols:SettingsCard>
244246

245247
<!-- Toolbar -->
246-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Toolbars}">
248+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Toolbars}">
247249
<wctcontrols:SettingsExpander.HeaderIcon>
248250
<PathIcon Data="{StaticResource App.Theme.PathIcon.WebAsset}" />
249251
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/DevToolsPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Text="{helpers:ResourceString Name=DevTools}" />
4747

4848
<!-- Display Open IDE status bar button -->
49-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=DisplayOpenIDE}">
49+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=DisplayOpenIDE}">
5050
<wctcontrols:SettingsExpander.HeaderIcon>
5151
<FontIcon Glyph="&#xE7AC;" />
5252
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/FoldersPage.xaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
Text="{helpers:ResourceString Name=Display}" />
3737

3838
<!-- Hidden Items -->
39-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=HiddenItems}">
39+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=HiddenItems}">
4040
<wctcontrols:SettingsExpander.HeaderIcon>
4141
<FontIcon Glyph="&#xED1A;" />
4242
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -95,7 +95,7 @@
9595
Text="{helpers:ResourceString Name=Behaviors}" />
9696

9797
<!-- Opening items -->
98-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=OpeningItems}">
98+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=OpeningItems}">
9999
<wctcontrols:SettingsExpander.HeaderIcon>
100100
<FontIcon Glyph="&#xED25;" />
101101
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -167,7 +167,10 @@
167167
</wctcontrols:SettingsCard>
168168

169169
<!-- Calculate folder sizes -->
170-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=CalculateFolderSizes}" IsExpanded="True">
170+
<wctcontrols:SettingsExpander
171+
AutomationProperties.AutomationControlType="Custom"
172+
Header="{helpers:ResourceString Name=CalculateFolderSizes}"
173+
IsExpanded="True">
171174
<wctcontrols:SettingsExpander.HeaderIcon>
172175
<FontIcon Glyph="&#xEE40;" />
173176
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/GeneralPage.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</wctcontrols:SettingsCard>
8585

8686
<!-- Startup settings -->
87-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=StartupSettings}">
87+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=StartupSettings}">
8888
<wctcontrols:SettingsExpander.HeaderIcon>
8989
<FontIcon Glyph="&#xE7E8;" />
9090
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -176,7 +176,7 @@
176176
</wctcontrols:SettingsExpander>
177177

178178
<!-- Dual Pane -->
179-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}">
179+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}">
180180
<wctcontrols:SettingsExpander.HeaderIcon>
181181
<FontIcon Glyph="&#xE89F;" />
182182
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -203,7 +203,7 @@
203203
</wctcontrols:SettingsCard>
204204

205205
<!-- Widgets -->
206-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Widgets}">
206+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Widgets}">
207207
<wctcontrols:SettingsExpander.HeaderIcon>
208208
<FontIcon Glyph="&#xF246;" />
209209
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -239,7 +239,7 @@
239239
Text="{helpers:ResourceString Name=SettingsContextMenu/Text}" />
240240

241241
<!-- Context menu options -->
242-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=ContextMenuOptions}">
242+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=ContextMenuOptions}">
243243
<wctcontrols:SettingsExpander.HeaderIcon>
244244
<FontIcon Glyph="&#xE74C;" />
245245
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/LayoutPage.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
Text="{helpers:ResourceString Name=SortingAndGrouping}" />
7272

7373
<!-- Default sorting options -->
74-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=SortBy}">
74+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=SortBy}">
7575
<wctcontrols:SettingsExpander.HeaderIcon>
7676
<FontIcon Glyph="&#xE8CB;" />
7777
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -147,7 +147,7 @@
147147
Text="{helpers:ResourceString Name=DetailsView}" />
148148

149149
<!-- Columns -->
150-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Columns}">
150+
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Columns}">
151151
<wctcontrols:SettingsExpander.HeaderIcon>
152152
<FontIcon Glyph="&#xE71D;" />
153153
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/TagsPage.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
Text="{helpers:ResourceString Name=FileTags}" />
4848

4949
<!-- Edit Tags -->
50-
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=FileTags}" IsExpanded="True">
50+
<wctcontrols:SettingsExpander
51+
AutomationProperties.AutomationControlType="Custom"
52+
Header="{helpers:ResourceString Name=FileTags}"
53+
IsExpanded="True">
5154
<wctcontrols:SettingsExpander.HeaderIcon>
5255
<FontIcon Glyph="&#xE8EC;" />
5356
</wctcontrols:SettingsExpander.HeaderIcon>

‎tests/Files.InteractionTests/Tests/SettingsTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public void VerifySettingsAreAccessible()
2828
{
2929
"SettingsItemGeneral",
3030
"SettingsItemAppearance",
31-
//"SettingsItemLayout", TODO find workaround for the "Group by" setting block issue
32-
"SettingsItemFolders",
33-
"SettingsItemActions",
34-
"SettingsItemTags",
35-
"SettingsItemDevTools",
36-
"SettingsItemAdvanced",
37-
"SettingsItemAbout"
31+
////"SettingsItemLayout", TODO find workaround for the "Group by" setting block issue
32+
//"SettingsItemFolders",
33+
//"SettingsItemActions",
34+
//"SettingsItemTags",
35+
//"SettingsItemDevTools",
36+
//"SettingsItemAdvanced",
37+
//"SettingsItemAbout"
3838
};
3939

4040
foreach (var item in settingsItems)

0 commit comments

Comments
 (0)