keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed the broken tests

Browse Source
pull/894/head
Morgan Pretty 10 months ago
parent f1ec4c90c5
commit d26e5468cb
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File

20
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -669,6 +669,8 @@
FD6A39722C2E3F5800762359 /* GRDBExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A39702C2E3F5800762359 /* GRDBExtensions.swift */; };
FD6A39732C2E3F5800762359 /* GRDBExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A39702C2E3F5800762359 /* GRDBExtensions.swift */; };
FD6A39742C2E3F5800762359 /* GRDBExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A39702C2E3F5800762359 /* GRDBExtensions.swift */; };
FD6A39772C2E885600762359 /* SSKMockedExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */; };
FD6A397A2C2E88EB00762359 /* SSKMockedExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */; };
FD6A7A692818BE7300035AC1 /* RetrieveDefaultOpenGroupRoomsJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A7A682818BE7300035AC1 /* RetrieveDefaultOpenGroupRoomsJob.swift */; };
FD6A7A6B2818C17C00035AC1 /* UpdateProfilePictureJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A7A6A2818C17C00035AC1 /* UpdateProfilePictureJob.swift */; };
FD6A7A6D2818C61500035AC1 /* _002_SetupStandardJobs.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A7A6C2818C61500035AC1 /* _002_SetupStandardJobs.swift */; };
@ -1796,6 +1798,7 @@
FD6A39442C2B783D00762359 /* UINavigationController+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Utilities.swift"; sourceTree = "<group>"; };
FD6A39482C2BB85A00762359 /* Crypto+Attachments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Crypto+Attachments.swift"; sourceTree = "<group>"; };
FD6A39702C2E3F5800762359 /* GRDBExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRDBExtensions.swift; sourceTree = "<group>"; };
FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSKMockedExtensions.swift; sourceTree = "<group>"; };
FD6A7A682818BE7300035AC1 /* RetrieveDefaultOpenGroupRoomsJob.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetrieveDefaultOpenGroupRoomsJob.swift; sourceTree = "<group>"; };
FD6A7A6A2818C17C00035AC1 /* UpdateProfilePictureJob.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateProfilePictureJob.swift; sourceTree = "<group>"; };
FD6A7A6C2818C61500035AC1 /* _002_SetupStandardJobs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _002_SetupStandardJobs.swift; sourceTree = "<group>"; };
@ -3892,6 +3895,14 @@
path = Crypto;
sourceTree = "<group>";
};
FD6A39752C2E884500762359 /* _TestUtilities */ = {
isa = PBXGroup;
children = (
FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */,
);
path = _TestUtilities;
sourceTree = "<group>";
};
FD7115F528C8150600B47552 /* Combine */ = {
isa = PBXGroup;
children = (
@ -4027,6 +4038,7 @@
FD7C37AF2BBB8B1E009DEEA7 /* SessionSnodeKitTests */ = {
isa = PBXGroup;
children = (
FD6A39752C2E884500762359 /* _TestUtilities */,
FD7C37BC2BBB8BB1009DEEA7 /* Models */,
);
path = SessionSnodeKitTests;
@ -5186,6 +5198,7 @@
/* Begin PBXShellScriptBuildPhase section */
FD5E93D32C12D3990038C25A /* Add App Group To Build Info Plist */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -5201,9 +5214,11 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "INFO_PLIST=\"${TARGET_BUILD_DIR}\"/\"${INFOPLIST_PATH}\"\nENTITLEMENTS_FILE=\"${SRCROOT}/${CODE_SIGN_ENTITLEMENTS}\"\n\n# Query and save the value; suppress any error message, if key not found.\nvalue=$(/usr/libexec/PlistBuddy -c 'print :AppGroupsId' \"${INFO_PLIST}\" 2>/dev/null)\n\n# Check if value is empty\nif [ -z \"$value\" ] \nthen\n /usr/libexec/PlistBuddy -c \"Add :AppGroupsId string\" \"${INFO_PLIST}\"\nfi\n\napp_group_id=$(xmllint --xpath 'string(//key[.=\"com.apple.security.application-groups\"]/following-sibling::array/string)' \"$ENTITLEMENTS_FILE\")\n\n/usr/libexec/PlistBuddy -c \"Set :AppGroupsId ${app_group_id}\" \"${INFO_PLIST}\"\n";
showEnvVarsInLog = 0;
};
FD5E93D42C12D3CB0038C25A /* Add Commit Hash To Build Info Plist */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -5247,6 +5262,7 @@
};
FD5E93D62C12D8270038C25A /* Add App Group To Build Info Plist */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -5262,9 +5278,11 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "INFO_PLIST=\"${TARGET_BUILD_DIR}\"/\"${INFOPLIST_PATH}\"\nENTITLEMENTS_FILE=\"${SRCROOT}/${CODE_SIGN_ENTITLEMENTS}\"\n\n# Query and save the value; suppress any error message, if key not found.\nvalue=$(/usr/libexec/PlistBuddy -c 'print :AppGroupsId' \"${INFO_PLIST}\" 2>/dev/null)\n\n# Check if value is empty\nif [ -z \"$value\" ] \nthen\n /usr/libexec/PlistBuddy -c \"Add :AppGroupsId string\" \"${INFO_PLIST}\"\nfi\n\napp_group_id=$(xmllint --xpath 'string(//key[.=\"com.apple.security.application-groups\"]/following-sibling::array/string)' \"$ENTITLEMENTS_FILE\")\n\n/usr/libexec/PlistBuddy -c \"Set :AppGroupsId ${app_group_id}\" \"${INFO_PLIST}\"\n";
showEnvVarsInLog = 0;
};
FD5E93D72C12DA400038C25A /* Add App Group To Build Info Plist */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -6214,6 +6232,7 @@
FD7C37BE2BBB8BBD009DEEA7 /* SnodeRequestSpec.swift in Sources */,
FD7C37C02BBB8BE1009DEEA7 /* Mocked.swift in Sources */,
FD7C37BF2BBB8BDF009DEEA7 /* Mock.swift in Sources */,
FD6A39772C2E885600762359 /* SSKMockedExtensions.swift in Sources */,
FD7C37C22BBB8BED009DEEA7 /* MockCaches.swift in Sources */,
FD7C37C62BBB8C08009DEEA7 /* TestConstants.swift in Sources */,
FD7C37C82BBB8C11009DEEA7 /* NimbleExtensions.swift in Sources */,
@ -6291,6 +6310,7 @@
FD23CE2E2A678E1E0000B97C /* MockCaches.swift in Sources */,
FD23EA6228ED0B260058676E /* CombineExtensions.swift in Sources */,
FD83B9C527CF3E2A005E1583 /* OpenGroupSpec.swift in Sources */,
FD6A397A2C2E88EB00762359 /* SSKMockedExtensions.swift in Sources */,
FD23CE342A67C4D90000B97C /* MockNetwork.swift in Sources */,
FDC2908B27D707F3005DAE71 /* SendMessageRequestSpec.swift in Sources */,
FDC290A827D9B46D005DAE71 /* NimbleExtensions.swift in Sources */,

13
SessionSnodeKitTests/_TestUtilities/SSKMockedExtensions.swift
Unescape Escape View File

@ -0,0 +1,13 @@
// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
import Foundation
import SessionUtilitiesKit
extension Network.Destination: Mocked {
static var mockValue: Network.Destination = Network.Destination.server(
url: URL(string: "https://oxen.io")!,
method: .get,
headers: nil,
x25519PublicKey: ""
)
}

10
_SharedTestUtilities/CommonMockedExtensions.swift
Unescape Escape View File

@ -4,7 +4,6 @@ import Foundation
import Combine
import GRDB
import SessionUtilitiesKit
import SessionSnodeKit
extension KeyPair: Mocked {
static var mockValue: KeyPair = KeyPair(
@ -37,15 +36,6 @@ extension Network.RequestType: MockedGeneric {
}
}
extension Network.Destination: Mocked {
static var mockValue: Network.Destination = Network.Destination.server(
url: URL(string: "https://oxen.io")!,
method: .get,
headers: nil,
x25519PublicKey: ""
)
}
extension AnyPublisher: MockedGeneric where Failure == Error {
typealias Generic = Output

Write Preview
Loading…
Cancel
Save