Merge pull request #1000 from mamabusi/storeCookieInDataHome
diff --git a/Foundation/NSHTTPCookieStorage.swift b/Foundation/NSHTTPCookieStorage.swift
index cda195e..470b582 100644
--- a/Foundation/NSHTTPCookieStorage.swift
+++ b/Foundation/NSHTTPCookieStorage.swift
@@ -47,7 +47,7 @@
allCookies = [:]
cookieAcceptPolicy = .always
super.init()
- cookieFilePath = filePath(path: _CFXDGCreateConfigHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
+ cookieFilePath = filePath(path: _CFXDGCreateDataHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
loadPersistedCookies()
}
diff --git a/TestFoundation/TestNSHTTPCookieStorage.swift b/TestFoundation/TestNSHTTPCookieStorage.swift
index d5c5e59..db02790 100644
--- a/TestFoundation/TestNSHTTPCookieStorage.swift
+++ b/TestFoundation/TestNSHTTPCookieStorage.swift
@@ -227,10 +227,10 @@
storage.setCookie(testCookie)
XCTAssertEqual(storage.cookies!.count, 3)
var destPath: String
- if let xdg_config_home = getenv("XDG_CONFIG_HOME") {
- destPath = String(utf8String: xdg_config_home)! + "/.cookies.shared"
+ if let xdg_data_home = getenv("XDG_DATA_HOME") {
+ destPath = String(utf8String: xdg_data_home)! + "/.cookies.shared"
} else {
- destPath = NSHomeDirectory() + "/.config/.cookies.shared"
+ destPath = NSHomeDirectory() + "/.local/share/.cookies.shared"
}
let fm = FileManager.default
var isDir = false
@@ -243,7 +243,7 @@
let task = Process()
task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
var environment = ProcessInfo.processInfo.environment
- environment["XDG_CONFIG_HOME"] = NSHomeDirectory() + "/TestXDG"
+ environment["XDG_DATA_HOME"] = NSHomeDirectory() + "/TestXDG"
task.environment = environment
// Launch the task
task.launch()
diff --git a/TestFoundation/XDGTestHelper.swift b/TestFoundation/XDGTestHelper.swift
index f45a3fb..422d725 100644
--- a/TestFoundation/XDGTestHelper.swift
+++ b/TestFoundation/XDGTestHelper.swift
@@ -7,11 +7,11 @@
.path: "/",
.domain: "example.com",
])!
-let rawValue = getenv("XDG_CONFIG_HOME")
-let xdg_config_home = String(utf8String: rawValue!)
+let rawValue = getenv("XDG_DATA_HOME")
+let xdg_data_home = String(utf8String: rawValue!)
storage.setCookie(simpleCookie)
let fm = FileManager.default
-let destPath = xdg_config_home! + "/.cookies.shared"
+let destPath = xdg_data_home! + "/.cookies.shared"
var isDir = false
let exists = fm.fileExists(atPath: destPath, isDirectory: &isDir)
if (!exists) {
