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

Bugfix MTE-3781 Use of https in history and bookmarks #22889

Merged
merged 5 commits into from
Nov 5, 2024
Merged

Bugfix MTE-3781 Use of https in history and bookmarks #22889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24fb909
Use https instead of http url
clarmso Nov 4, 2024
9f9e904
Use https URL throughout the tests
clarmso Nov 4, 2024
8456240
Revert username
clarmso Nov 4, 2024
190d346
Put back http because of the database
clarmso Nov 5, 2024
fb4cf15
Use https URL in testFxASyncBookmark
clarmso Nov 5, 2024
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
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_bookmark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var phases = { "phase1": "profile1" };
// expected bookmark state
var bookmarksExpected = {
"mobile": [{
uri: "http://www.example.com/",
uri: "https://www.example.com/",
title: "Example Domain"}]
};

Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_bookmark_desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var phases = { "phase1": "profile1" };
// expected bookmark state
var bookmarksCreated = {
"mobile": [{
uri: "http://www.example.com/",
uri: "https://www.example.com/",
title: "Example Domain"}]
};

Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_bookmark_login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var phases = { "phase1": "profile1" };
// expected bookmark state
var bookmarksCreated = {
"mobile": [{
uri: "http://www.example.com/",
uri: "https://www.example.com/",
title: "Example Domain"}]
};

Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_history_desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var phases = { "phase1": "profile1" };

// expected history state
var historyCreated = [
{ uri: "http://www.example.com/",
{ uri: "https://www.example.com/",
visits: [
{ type: 1 ,
date: 0
Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var phases = { "phase1": "profile1" };

// expected tabs state
var tabs1 = [
{ uri: "http://example.com/",
{ uri: "https://example.com/",
profile: "Fennec (administrator) on iOS"
}
];
Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/test_tabs_desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var phases = { "phase1": "profile1", "phase2": "profile1" };


var tabs1 = [
{ uri: "http://example.com/",
{ uri: "https://example.com/",
profile: "Fennec on iOS"
}
];
Expand Down
8 changes: 4 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/IntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import Common
import XCTest

private let testingURL = "example.com"
private let testingURL = "https://example.com"
private let userName = "iosmztest"
private let userPassword = "test15mz"
private let historyItemSavedOnDesktop = "http://www.example.com/"
private let historyItemSavedOnDesktop = "https://www.example.com/"
private let loginEntry = "https://accounts.google.com"
private let tabOpenInDesktop = "http://example.com/"
private let tabOpenInDesktop = "https://example.com/"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

On desktop, the URL is redirected to https.


class IntegrationTests: BaseTestCase {
let testWithDB = ["testFxASyncHistory"]
Expand Down Expand Up @@ -111,7 +111,7 @@ class IntegrationTests: BaseTestCase {
func testFxASyncBookmark () {
// Bookmark is added by the DB
// Sign into Mozilla Account
navigator.openURL("example.com")
navigator.openURL(testingURL)
mozWaitForElementToExist(app.buttons[AccessibilityIdentifiers.Toolbar.trackingProtection])
navigator.goto(BrowserTabMenu)
app.tables.otherElements[StandardImageIdentifiers.Large.bookmark].waitAndTap()
Expand Down