corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1371195 - Preserve Form Autofill profiles during a Firefox Refresh/Reset. r=Gijs

Browse Source 
MozReview-Commit-ID: 3wSAmKt8Xaf
This commit is contained in:
Matthew Noorenberghe
2017-08-07 22:09:39 -07:00
parent 885a687355
commit bbb25c2de8
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
browser/components/migration/FirefoxProfileMigrator.js
View File

@@ -133,7 +133,10 @@ FirefoxProfileMigrator.prototype._getResourcesInternal = function(sourceProfileD
let passwords = getFileResource(types.PASSWORDS,
["signons.sqlite", "logins.json", "key3.db",
"signedInUser.json"]);
let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
let formData = getFileResource(types.FORMDATA, [
"formhistory.sqlite",
"autofill-profiles.json",
]);
let bookmarksBackups = getFileResource(types.OTHERDATA,
[PlacesBackups.profileRelativeFolderPath]);
let dictionary = getFileResource(types.OTHERDATA, ["persdict.dat"]);

41
browser/components/migration/tests/marionette/test_refresh_firefox.py
View File

@@ -25,6 +25,8 @@ class TestFirefoxRefresh(MarionetteTestCase):
_formHistoryFieldName = "some-very-unique-marionette-only-firefox-reset-field"
_formHistoryValue = "special-pumpkin-value"
_formAutofillAddressGuid = None
_expectedURLs = ["about:robots", "about:mozilla"]
def savePassword(self):
@@ -101,6 +103,26 @@ class TestFirefoxRefresh(MarionetteTestCase):
if error:
print error
def createFormAutofill(self):
self._formAutofillAddressGuid = self.runAsyncCode("""
const TEST_ADDRESS_1 = {
"given-name": "John",
"additional-name": "R.",
"family-name": "Smith",
organization: "World Wide Web Consortium",
"street-address": "32 Vassar Street\\\nMIT Room 32-G524",
"address-level2": "Cambridge",
"address-level1": "MA",
"postal-code": "02139",
country: "US",
tel: "+15195555555",
email: "user@example.com",
};
return global.profileStorage.initialize().then(() => {
return global.profileStorage.addresses.add(TEST_ADDRESS_1);
}).then(marionetteScriptFinished);
""")
def createCookie(self):
self.runCode("""
// Expire in 15 minutes:
@@ -225,6 +247,22 @@ class TestFirefoxRefresh(MarionetteTestCase):
""")
self.assertEqual(formHistoryCount, 1, "There should be only 1 entry in the form history")
def checkFormAutofill(self):
formAutofillResults = self.runAsyncCode("""
return global.profileStorage.initialize().then(() => {
return global.profileStorage.addresses.getAll()
}).then(marionetteScriptFinished);
""",)
if type(formAutofillResults) == str:
self.fail(formAutofillResults)
return
formAutofillAddressCount = len(formAutofillResults)
self.assertEqual(formAutofillAddressCount, 1, "Should have exactly 1 saved address, got %d" % formAutofillAddressCount)
if formAutofillAddressCount == 1:
self.assertEqual(formAutofillResults[0]['guid'], self._formAutofillAddressGuid)
def checkCookie(self):
cookieInfo = self.runCode("""
try {
@@ -297,6 +335,7 @@ class TestFirefoxRefresh(MarionetteTestCase):
self.checkBookmark()
self.checkHistory()
self.checkFormHistory()
self.checkFormAutofill()
self.checkCookie()
if hasMigrated:
self.checkSession()
@@ -306,6 +345,7 @@ class TestFirefoxRefresh(MarionetteTestCase):
self.createBookmark()
self.createHistory()
self.createFormHistory()
self.createFormAutofill()
self.createCookie()
self.createSession()
@@ -317,6 +357,7 @@ class TestFirefoxRefresh(MarionetteTestCase):
global.profSvc = Cc["@mozilla.org/toolkit/profile-service;1"].getService(Ci.nsIToolkitProfileService);
global.Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
global.FormHistory = Cu.import("resource://gre/modules/FormHistory.jsm", {}).FormHistory;
global.profileStorage = Cu.import("resource://formautofill/ProfileStorage.jsm", {}).profileStorage;
""")
def runCode(self, script, *args, **kwargs):