folkslinux
/
windows-terminal
mirror of https://github.com/microsoft/terminal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Two sets of localtest fixes for July 2022 (#13603) 

Cleans up a couple local test failures.

* [x] Closes #13474: So, I clearly hadn't ran the local tests at the end of the themes PR. We needed a sensible fallback to SOME theme, even if there wasn't one provided in the user json. This is only really hit in the tests (that don't also include `defaults.json`.
* [x] Closes #13323: Meh, the ordering of the keys in this test doesn't matter. Ordering is a map implementation detail. This is fine.
* [x] Ran tests locally
This commit is contained in:
Mike Griese 2022-07-27 14:39:51 -05:00 committed by GitHub
parent 17db409e7a
commit 73e7fd16d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp
View File

@ -253,9 +253,14 @@ namespace SettingsModelLocalTests
{ "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+c" },
{ "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+d" }
])" };
// GH#13323 - these can be fragile. In the past, the order these get
// re-serialized as has been not entirely stable. We don't really care
// about the order they get re-serialized in, but the tests aren't
// clever enough to compare the structure, only the literal string
// itself. Feel free to change as needed.
static constexpr std::string_view actionsString4B{ R"([
{ "command": { "action": "findMatch", "direction": "next" }, "keys": "ctrl+shift+s" },
{ "command": { "action": "findMatch", "direction": "prev" }, "keys": "ctrl+shift+r" }
{ "command": { "action": "findMatch", "direction": "prev" }, "keys": "ctrl+shift+r" },
{ "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+d" }
])" };
// command with name and icon and multiple key chords
@ -455,7 +460,9 @@ namespace SettingsModelLocalTests
],
"actions": [
{ "command": { "action": "sendInput", "input": "VT Griese Mode" }, "keys": "ctrl+k" }
]
],
"theme": "system",
"themes": []
})" };
const auto settings{ winrt::make_self<implementation::CascadiaSettings>(settingsString) };

14
src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
View File

@ -1156,6 +1156,20 @@ void CascadiaSettings::ExportFile(winrt::hstring path, winrt::hstring content)
void CascadiaSettings::_validateThemeExists()
{
if (_globals->Themes().Size() == 0)
{
// We didn't even load the default themes. This should only be possible
// if the defaults.json didn't include any themes, or if no
// defaults.json was loaded at all. The second case is especially common
// in tests (that don't bother with a defaults.json). No matter. Create
// a default theme under `system` and just stick it in there.
auto newTheme = winrt::make_self<Theme>();
newTheme->Name(L"system");
_globals->AddTheme(*newTheme);
_globals->Theme(L"system");
}
if (!_globals->Themes().HasKey(_globals->Theme()))
{
_warnings.Append(SettingsLoadWarnings::UnknownTheme);