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

Jump to bottom

Native Page Editor Container and UI Tests #4682

Merged
merged 42 commits into from Dec 5, 2023
Merged

Native Page Editor Container and UI Tests #4682

merged 42 commits into from Dec 5, 2023

Conversation

mazevedofs
Copy link
Collaborator

Phabricator: https://phabricator.wikimedia.org/T347870

Notes

Test Steps

  1. To test the component itself, run the app On the staging target and tap edit on an article. You should see the new editor
  2. To run the UI Tests, hit CMD +U on the new WikipediaUITests target
  3. Run the tests on Xcode Cloud - manually trigger the UI Tests workflow under the main app configurations

Note: currently the theming is not working on the test plan configurations, I'm investigating that

mazevedofs and others added 27 commits November 9, 2023 13:08
@mazevedofs
Native source editor component adjustments
30955d0 
This PR brings over to the main repo the contents of this PR wikimedia/wikipedia-ios-components#9
@mazevedofs
Add WKSourceEditorLocalizedStrings struct
e78259a
@mazevedofs
Add native page editor localized strings
e84d713
@mazevedofs
Inject localized strings on page editor
8180953
@tonisevener @mazevedofs
Add ui testing bundle target
e5e4a77
@tonisevener @mazevedofs
Update UI Testing bundle deployment target to iOS 15
de369d7
@tonisevener @mazevedofs
Add UITests Test plan
00f42b2
@tonisevener @mazevedofs
Add UITests Test in Wikipedia scheme > Test (leaving default unselected)
e4f5d0d
@tonisevener @mazevedofs
Add UITests configuration in Project > Info, duplicated from Test con…
cdf80da 
…figuration
@tonisevener @mazevedofs
Update macro Test flag in UITests configuration to UITest for all tar…
f15754f 
…gets
@tonisevener @mazevedofs
Change explore feed search bar color to help debug which macro is used
04580b2
@tonisevener @mazevedofs
Duplicate Wikipedia scheme into WikipediaUITests scheme
cdcadaa
@tonisevener @mazevedofs
Delete UITests test plan from Wikipedia scheme
3fdeaa6
@tonisevener @mazevedofs
Delete Wikipedia test plan from WikipediaUITests scheme
6082bef
@tonisevener @mazevedofs
Add UITests test plan to WikipediaUITests scheme
c46aba3
@tonisevener @mazevedofs
Point to UITests build configuration in WikipediaUITests scheme > Tes…
5a129de 
…t section
@tonisevener @mazevedofs
Delete WikipediaUnitTests row in WikipediaUITests scheme > Build sect…
6466d5c 
…ion to fix compile failures
@mazevedofs
WIP
ef9c822
@mazevedofs
Wip tests
210c5e6
@mazevedofs
Setup new UITest configurations for themes and other languages
8d0e867
@mazevedofs
Inject strings on test
7fc9b89
@mazevedofs
Add UI Tests helper controller
ffe5f13
@mazevedofs
Present helper controller on UI Tests
5a146fe
@mazevedofs
Keep main Wikipedia target defaul tests as unit tests
117c6dd
@mazevedofs
Fix whitespace
5e95d77
@mazevedofs
Configure uitest schema
073c79b
@mazevedofs
Skip onboarding on UI tests
3cd246f
@tonisevener tonisevener self-assigned this Nov 29, 2023
tonisevener
tonisevener requested changes Nov 29, 2023
View reviewed changes
Copy link
Collaborator

@tonisevener tonisevener left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, it's looking good! I noticed the theming in the UI tests weren't working quite right on my machine, so I pushed a fix for that. I also reverted any UITest mentions in the other schemes that seemed unnecessary to me. Let me know if that works for you.

Unit tests are failing because of merge conflicts with main, but hopefully they'll run again once conflicts are fixed.

...nents/Editors/Common Views/Input Accessory Views/Find and Replace/WKFindAndReplaceView.swift Show resolved Hide resolved
...nents/Editors/Common Views/Input Accessory Views/Find and Replace/WKFindAndReplaceView.swift Outdated Show resolved Hide resolved
...nents/Editors/Common Views/Input Accessory Views/Find and Replace/WKFindAndReplaceView.swift Show resolved Hide resolved
...ents/Editors/Common Views/Input Accessory Views/Highlight/WKEditorToolbarHighlightView.swift Outdated Show resolved Hide resolved
Wikipedia/Code/ExploreViewController.swift Outdated Show resolved Hide resolved
WikipediaUITests/UITestHelperContainerViewController.swift Outdated Show resolved Hide resolved
Test Plans/UITests.xctestplan Outdated Show resolved Hide resolved
WMF Framework/CommonStrings.swift Outdated Show resolved Hide resolved
WMF Framework/CommonStrings.swift Outdated Show resolved Hide resolved
Wikipedia.xcodeproj/xcshareddata/xcschemes/NotificationServiceExtension.xcscheme Show resolved Hide resolved
@tonisevener tonisevener removed their assignment Nov 29, 2023
@mazevedofs
Copy link
Collaborator Author

Nice work, it's looking good! I noticed the theming in the UI tests weren't working quite right on my machine, so I pushed a fix for that. I also reverted any UITest mentions in the other schemes that seemed unnecessary to me. Let me know if that works for you.

Unit tests are failing because of merge conflicts with main, but hopefully they'll run again once conflicts are fixed.

Thanks for fixing the theming, it wasn't really working, but I couldn't figure it out (and forgot to ask about it on our 1:1s)

mazevedofs and others added 3 commits December 4, 2023 17:47
@mazevedofs
Code review feedback changes
70a35b7 
String updates, formatting, removing unused extensions and UI Test plan configurations updates
@mazevedofs
Add procol conformance to ExploreViewController for UITests, localiza…
1ea8656 
…ble strings
@tonisevener
Merge branch 'main' into page-editor-ui-tests
22b0bc4
tonisevener
tonisevener approved these changes Dec 5, 2023
View reviewed changes
Copy link
Collaborator

@tonisevener tonisevener left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏 Working great!

tonisevener
tonisevener reviewed Dec 5, 2023
View reviewed changes
Wikipedia/Code/ExploreViewController.swift

extension ExploreViewController: WKSourceEditorViewControllerDelegate {
func sourceEditorViewControllerDidTapFind(sourceEditorViewController: Components.WKSourceEditorViewController) {
// protocol conformance to run UI Tests
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I missed that this was needed. 😅

@tonisevener tonisevener merged commit ee174ce into main Dec 5, 2023
4 checks passed
@tonisevener tonisevener deleted the page-editor-ui-tests branch December 5, 2023 16:09
@tonisevener tonisevener mentioned this pull request Dec 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonisevener tonisevener tonisevener approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
4 participants
@mazevedofs @tonisevener @translatewiki @staykids