-
Notifications
You must be signed in to change notification settings - Fork 425
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into sam/remove-apptp
# By Christopher Brind (2) and others # Via GitHub * main: Use trait collection to control theme changes (#2672) Expand maestro tests (#2691) scroll to selected item after opening new tab, etc (#2689) Update autoconsent to v10.5.0 (#2671) Fix history debug view controller causing crash on tap (#2681) # Conflicts: # DuckDuckGo/HomeCollectionView.swift # DuckDuckGo/HomeViewController.swift
- Loading branch information
Showing
117 changed files
with
868 additions
and
980 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # tabs.yaml | ||
| appId: com.duckduckgo.mobile.ios | ||
| tags: | ||
| - release | ||
|
|
||
| --- | ||
|
|
||
| # Set up | ||
| - clearState | ||
| - launchApp | ||
| - runFlow: | ||
| when: | ||
| visible: | ||
| text: "Let’s Do It!" | ||
| index: 0 | ||
| file: ../shared/onboarding.yaml | ||
|
|
||
| # Load Site | ||
| - assertVisible: | ||
| id: "searchEntry" | ||
| - tapOn: | ||
| id: "searchEntry" | ||
| - inputText: "https://privacy-test-pages.site" | ||
| - pressKey: Enter | ||
|
|
||
| # Manage onboarding | ||
| - runFlow: | ||
| when: | ||
| visible: | ||
| text: "Got It" | ||
| index: 0 | ||
| file: ../shared/onboarding_browsing.yaml | ||
|
|
||
| - assertVisible: ".*Privacy Test Pages.*" | ||
| - tapOn: "Links Open in New Window" | ||
|
|
||
| # Validate there's one tab | ||
| - runFlow: | ||
| file: ../shared/check_number_of_tabs.yaml | ||
| env: | ||
| TITLE: "1 Private Tab" | ||
|
|
||
| - tapOn: "Opens in new window" | ||
| - runFlow: | ||
| file: ../shared/check_number_of_tabs.yaml | ||
| env: | ||
| TITLE: "2 Private Tabs" | ||
|
|
||
| - tapOn: "Close" | ||
| - assertVisible: "A link that opens in a new window" | ||
| - tapOn: "Opens in new window" | ||
| - runFlow: | ||
| file: ../shared/check_number_of_tabs.yaml | ||
| env: | ||
| TITLE: "2 Private Tabs" | ||
|
|
||
| - tapOn: "Browse Back" | ||
| - assertVisible: "A link that opens in a new window" | ||
|
|
||
| # Workaround - for some reason Tab Switcher button is not found by maestro at this point. | ||
| - tapOn: "Refresh Page" | ||
| - runFlow: | ||
| file: ../shared/check_number_of_tabs.yaml | ||
| env: | ||
| TITLE: "1 Private Tab" |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| appId: com.duckduckgo.mobile.ios | ||
| tags: | ||
| - dataclearing | ||
| - privacy | ||
|
|
||
| --- | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| appId: com.duckduckgo.mobile.ios | ||
| --- | ||
|
|
||
| - assertVisible: "Tab Switcher" | ||
| - tapOn: "Tab Switcher" | ||
| - assertVisible: ${TITLE} | ||
| - tapOn: "Done" |
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
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
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
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
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
12 changes: 0 additions & 12 deletions
12
DuckDuckGo/Assets.xcassets/ErrorInfoDark.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
DuckDuckGo/Assets.xcassets/ErrorInfoLight.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
DuckDuckGo/Assets.xcassets/ErrorInfoUniversal.imageset/Contents.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "errorImgLight.pdf", | ||
| "idiom" : "universal" | ||
| }, | ||
| { | ||
| "appearances" : [ | ||
| { | ||
| "appearance" : "luminosity", | ||
| "value" : "dark" | ||
| } | ||
| ], | ||
| "filename" : "errorImgDark.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
17 changes: 0 additions & 17 deletions
17
DuckDuckGo/Assets.xcassets/LogoDarkText.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
DuckDuckGo/Assets.xcassets/LogoLightText.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.