Skip to content
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.

Sign up for GitHub

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

Don't explode name-only profiles #2789

Merged
merged 8 commits into from
Sep 17, 2019
+187 −0
Merged

Don't explode name-only profiles #2789

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
907ebcd
Add a test for #2782
zadjii-msft Sep 17, 2019
f204b98
Attempt to do something weird with _GenerateStub
zadjii-msft Sep 17, 2019
85b8b8a
Add some more notes on why this was a bad idea
zadjii-msft Sep 17, 2019
3feaefe
Actually fix the issue at hand
zadjii-msft Sep 17, 2019
30c0bc3
Revert "Add some more notes on why this was a bad idea"
zadjii-msft Sep 17, 2019
1ef2074
Revert "Attempt to do something weird with _GenerateStub"
zadjii-msft Sep 17, 2019
8ae7dee
Little test fixes
zadjii-msft Sep 17, 2019
be1d305
Update src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
zadjii-msft Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Little test fixes
@zadjii-msft
zadjii-msft committed Sep 17, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 8ae7dee7f1edc549da2b7f5a6d7037c8a3f24b0b
4 changes: 3 additions & 1 deletion src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
View file
Original file line number Diff line number Diff line change
@@ -1093,7 +1093,9 @@ namespace TerminalAppLocalTests
VERIFY_ARE_EQUAL(2u, settings2._profiles.size());
// Initialize the second settings object from the first settings
// object's settings string, the one that we synthesized.
settings2._ParseJsonString(settings._userSettingsString, false);
const auto firstSettingsString = settings._userSettingsString;
settings2._ParseJsonString(firstSettingsString, false);
settings2.LayerJson(settings2._userSettings);
VERIFY_ARE_EQUAL(5u, settings2._profiles.size());
VERIFY_IS_TRUE(settings2._profiles.at(0)._guid.has_value());
VERIFY_IS_TRUE(settings2._profiles.at(1)._guid.has_value());