[UITest] Remove the bottom section of iOS UITest #24586
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tj-devel709
force-pushed
the
dev/TJ/RemoveBottomiOSUITest
branch
from
8e81524 to
8791b7e
Compare
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
tj-devel709
force-pushed
the
dev/TJ/RemoveBottomiOSUITest
branch
from
8b21d93 to
c784774
Compare
PureWeen
force-pushed
the
dev/TJ/RemoveBottomiOSUITest
branch
from
c784774 to
c026155
Compare
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
rmarinho
approved these changes
Oct 4, 2024
samhouts
added
fixed-in-net9.0-nightly
rmarinho
added a commit
that referenced
this pull request
Oct 16, 2024
* add bottom screenshot crop * increase crop by 2 * make it 40 * wave 1 of screenshots * wave 2 of screenshots * new screenshots 3 * new screenshots 4 * new screenshots 5 * - additional updates * Add more updated images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
rmarinho
added a commit
that referenced
this pull request
Oct 16, 2024
* add bottom screenshot crop * increase crop by 2 * make it 40 * wave 1 of screenshots * wave 2 of screenshots * new screenshots 3 * new screenshots 4 * new screenshots 5 * - additional updates * Add more updated images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
|
/backport to release/9.0.1xx |
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/maui/actions/runs/11390807488 |
|
@rmarinho backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: add bottom screenshot crop
Applying: increase crop by 2
Applying: make it 40
Applying: wave 1 of screenshots
warning: Cannot merge binary files: src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png (HEAD vs. wave 1 of screenshots)
Using index info to reconstruct a base tree...
M src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png
Falling back to patching base and 3-way merge...
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_End.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Center.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png
Auto-merging src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png
CONFLICT (content): Merge conflict in src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks-iOS-UITestBaseTearDown-ScreenShot-0b04d693dcdb426aa0e39747f469b61d.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LabelUITests_FontFamily_Ionicons.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo500.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18751Test.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18242Test.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageUITests_Source_FontImageSource_Ionicons.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageUITests_IsAnimationPlaying_Yes.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageButtonUITests_Padding_Removed.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageButtonUITests_Padding_Add_Added.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageButtonUITests_Aspect_State_Fill.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageButtonUITests_Aspect_State_Center.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageButtonUITests_Aspect_State_AspectFill.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionRight.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionLeft.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionBottom.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingBorderWidth.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithoutRadius.png
Removing src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AppThemeShouldChangeLightTheme.png
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 wave 1 of screenshots
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@rmarinho an error occurred while backporting to release/9.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
PureWeen
pushed a commit
that referenced
this pull request
Oct 17, 2024
* add bottom screenshot crop * increase crop by 2 * make it 40 * wave 1 of screenshots * wave 2 of screenshots * new screenshots 3 * new screenshots 4 * new screenshots 5 * - additional updates * Add more updated images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> # Conflicts: # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageSourceInitializesCorrectly.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsAfterScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsBeforeScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png
PureWeen
pushed a commit
that referenced
this pull request
Oct 18, 2024
* add bottom screenshot crop * increase crop by 2 * make it 40 * wave 1 of screenshots * wave 2 of screenshots * new screenshots 3 * new screenshots 4 * new screenshots 5 * - additional updates * Add more updated images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> # Conflicts: # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageSourceInitializesCorrectly.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsAfterScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsBeforeScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png
PureWeen
added a commit
that referenced
this pull request
Oct 18, 2024
* [UITest] Remove the bottom section of iOS UITest (#24586) * add bottom screenshot crop * increase crop by 2 * make it 40 * wave 1 of screenshots * wave 2 of screenshots * new screenshots 3 * new screenshots 4 * new screenshots 5 * - additional updates * Add more updated images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> # Conflicts: # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ImageSourceInitializesCorrectly.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsAfterScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsBeforeScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png * - Update corrected images * - fix tabs * - fix ipad * - fix indent --------- Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
samhouts
added
fixed-in-9.0.10
fixed-in-net8.0-nightly
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
The Home Indicator Bar on iOS Screenshots for the UITests can be a little inconsistent at times. Since we cannot fully remove the home indicator bar, let's crop out the bottom portion of these screenshots.