Skip to content

Commit

Permalink
Update tests to point to new privacy page URL (#3527)
Browse files Browse the repository at this point in the history
<!--
Note: This checklist is a reminder of our shared engineering
expectations.
The items in Bold are required
If your PR involves UI changes:
1. Upload screenshots or screencasts that illustrate the changes before
/ after
2. Add them under the UI changes section (feel free to add more columns
if needed)
If your PR does not involve UI changes, you can remove the **UI
changes** section

At a minimum, make sure your changes are tested in API 23 and one of the
more recent API levels available.
-->

Task/Issue URL:
https://app.asana.com/0/488551667048375/1205442219109577/f

### Description
Updates the URLs for the privacy test pages since we've moved them to
new infrastructure.

`Current: privacy-test-pages.glitch.me`
`New:     privacy-test-pages.site`

ℹ️ Note, `global-privacy-control.glitch.me` remains deliberately, as per
[link](https://app.asana.com/0/0/1205403548898249/1205420985241292/f)

### Steps to test this PR

- [ ] Ensure maestro e2e tests pass
(https://github.com/duckduckgo/Android/actions/runs/6157390651)
- [ ] Ensure privacy tests passed
(https://github.com/duckduckgo/Android/actions/runs/6223122120)
  • Loading branch information
CDRussell authored Sep 20, 2023
1 parent 4f1c0e5 commit cf836bd
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
2 changes: 1 addition & 1 deletion .maestro/browsing/visit_site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
2 changes: 1 addition & 1 deletion .maestro/favorites/favorites_bookmarks_delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
2 changes: 1 addition & 1 deletion .maestro/favorites/favorites_bookmarks_undo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
2 changes: 1 addition & 1 deletion .maestro/favorites/favorites_menu_add_remove.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
2 changes: 1 addition & 1 deletion .maestro/fire_button/fire_during_onboarding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tags:

- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tags:
- launchApp:
clearState: true
- runFlow: ../shared/onboarding.yaml
- inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/"
- inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tags:
- launchApp:
clearState: true
- runFlow: ../shared/onboarding.yaml
- inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/"
- inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tags:
- launchApp:
clearState: true
- runFlow: ../shared/onboarding.yaml
- inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/"
- inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tags:
- launchApp:
clearState: true
- runFlow: ../shared/onboarding.yaml
- inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/"
- inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
2 changes: 1 addition & 1 deletion .maestro/tabs/open_multiple_tabs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tags:
text: ".*I'll also upgrade the security of your connection if possible.*"
- tapOn:
text: "search or type URL"
- inputText: "https://privacy-test-pages.glitch.me"
- inputText: "https://privacy-test-pages.site"
- tapOn:
id: "com.google.android.inputmethod.latin:id/key_pos_ime_action"
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CookiesTest {
var activityScenarioRule = activityScenarioRule<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
queryExtra = "https://privacy-test-pages.glitch.me/privacy-protections/storage-blocking/?store",
queryExtra = "https://privacy-test-pages.site/privacy-protections/storage-blocking/?store",
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class FingerprintProtectionTest {
val scenario = ActivityScenario.launch<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
"https://privacy-test-pages.glitch.me/privacy-protections/fingerprinting/",
"https://privacy-test-pages.site/privacy-protections/fingerprinting/",
),
)
scenario.onActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class GpcTest {
var activityScenarioRule = activityScenarioRule<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
queryExtra = "https://privacy-test-pages.glitch.me/privacy-protections/gpc/",
queryExtra = "https://privacy-test-pages.site/privacy-protections/gpc/",
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class HttpsUpgradesTest {
var activityScenarioRule = activityScenarioRule<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
queryExtra = "http://privacy-test-pages.glitch.me/privacy-protections/https-upgrades/",
queryExtra = "http://privacy-test-pages.site/privacy-protections/https-upgrades/",
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class RequestBlockingTest {
ActivityScenario.launch<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
"https://privacy-test-pages.glitch.me/privacy-protections/request-blocking/?run",
"https://privacy-test-pages.site/privacy-protections/request-blocking/?run",
),
)

Expand Down Expand Up @@ -84,7 +84,7 @@ class RequestBlockingTest {
val scenario = ActivityScenario.launch<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
"https://privacy-test-pages.glitch.me/privacy-protections/request-blocking/?run",
"https://privacy-test-pages.site/privacy-protections/request-blocking/?run",
),
)
scenario.onActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class SurrogatesTest {
val scenario = ActivityScenario.launch<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
"https://privacy-test-pages.glitch.me/privacy-protections/surrogates/",
"https://privacy-test-pages.site/privacy-protections/surrogates/",
),
)
scenario.onActivity {
Expand Down Expand Up @@ -95,7 +95,7 @@ class SurrogatesTest {
val scenario = ActivityScenario.launch<BrowserActivity>(
BrowserActivity.intent(
InstrumentationRegistry.getInstrumentation().targetContext,
"https://privacy-test-pages.glitch.me/privacy-protections/surrogates/",
"https://privacy-test-pages.site/privacy-protections/surrogates/",
),
)
scenario.onActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ class AuditSettingsViewModel @Inject constructor(
const val STEP_1 = "https://cnn.com"
const val STEP_2 = "https://gizmodo.com"
const val STEP_3 = "https://httpbin.org/basic-auth/u/pw"
const val REQUEST_BLOCKING = "https://privacy-test-pages.glitch.me/privacy-protections/request-blocking/?run"
const val HTTPS_UPGRADES = "http://privacy-test-pages.glitch.me/privacy-protections/https-upgrades/?run"
const val FIRE_BUTTON_STORE = "https://privacy-test-pages.glitch.me/privacy-protections/storage-blocking/?store"
const val FIRE_BUTTON_RETRIEVE = "https://privacy-test-pages.glitch.me/privacy-protections/storage-blocking/?retrive"
const val COOKIES_3P_STORE = "https://privacy-test-pages.glitch.me/privacy-protections/storage-blocking/?store"
const val COOKIES_3P_RETRIEVE = "https://privacy-test-pages.glitch.me/privacy-protections/storage-blocking/?retrive"
const val GPC = "https://privacy-test-pages.glitch.me/privacy-protections/gpc/?run"
const val REQUEST_BLOCKING = "https://privacy-test-pages.site/privacy-protections/request-blocking/?run"
const val HTTPS_UPGRADES = "http://privacy-test-pages.site/privacy-protections/https-upgrades/?run"
const val FIRE_BUTTON_STORE = "https://privacy-test-pages.site/privacy-protections/storage-blocking/?store"
const val FIRE_BUTTON_RETRIEVE = "https://privacy-test-pages.site/privacy-protections/storage-blocking/?retrive"
const val COOKIES_3P_STORE = "https://privacy-test-pages.site/privacy-protections/storage-blocking/?store"
const val COOKIES_3P_RETRIEVE = "https://privacy-test-pages.site/privacy-protections/storage-blocking/?retrive"
const val GPC = "https://privacy-test-pages.site/privacy-protections/gpc/?run"
const val GPC_OTHER = "https://global-privacy-control.glitch.me/"
const val SURROGATES = "https://privacy-test-pages.glitch.me/privacy-protections/surrogates/"
val domainsUsed = listOf("privacy-test-pages.glitch.me", "privacy-test-pages.glitch.me")
const val SURROGATES = "https://privacy-test-pages.site/privacy-protections/surrogates/"
val domainsUsed = listOf("privacy-test-pages.site", "privacy-test-pages.site")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"globalprivacycontrol.org",
"washingtonpost.com",
"nytimes.com",
"privacy-test-pages.glitch.me"
"privacy-test-pages.site"
]
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"globalprivacycontrol.org",
"washingtonpost.com",
"nytimes.com",
"privacy-test-pages.glitch.me"
"privacy-test-pages.site"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"globalprivacycontrol.org",
"washingtonpost.com",
"nytimes.com",
"privacy-test-pages.glitch.me"
"privacy-test-pages.site"
]
}
}

0 comments on commit cf836bd

Please sign in to comment.