Fixing tests again
All checks were successful
openium/resgen.swift/pipeline/head This commit is unstable
All checks were successful
openium/resgen.swift/pipeline/head This commit is unstable
This commit is contained in:
@@ -64,7 +64,7 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
|
|||||||
) {
|
) {
|
||||||
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
||||||
|
|
||||||
let urlString = URL(string: "\(trackerUrl)" + "/" + "\(path)" + "yolo"
|
let urlString = URL(string: "\(trackerUrl)" + "/" + "\(path)" + "/yolo")
|
||||||
tracker.track(
|
tracker.track(
|
||||||
view: [name],
|
view: [name],
|
||||||
url: urlString
|
url: urlString
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ enum MatomoGenerator {
|
|||||||
) {
|
) {
|
||||||
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
||||||
|
|
||||||
let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)"\(pathSuffixCode)
|
let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)"\(pathSuffixCode))
|
||||||
tracker.track(
|
tracker.track(
|
||||||
view: [name],
|
view: [name],
|
||||||
url: urlString
|
url: urlString
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
|
|||||||
) {
|
) {
|
||||||
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
|
||||||
|
|
||||||
let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
|
let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "/iOS")
|
||||||
tracker.track(
|
tracker.track(
|
||||||
view: [name],
|
view: [name],
|
||||||
url: urlString
|
url: urlString
|
||||||
@@ -427,19 +427,19 @@ final class AnalyticsGeneratorTests: XCTestCase {
|
|||||||
// Given
|
// Given
|
||||||
let sectionOne = AnalyticsCategory(id: "section_one")
|
let sectionOne = AnalyticsCategory(id: "section_one")
|
||||||
sectionOne.definitions = [
|
sectionOne.definitions = [
|
||||||
getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one/", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
|
getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
|
||||||
getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
|
getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
let sectionTwo = AnalyticsCategory(id: "section_two")
|
let sectionTwo = AnalyticsCategory(id: "section_two")
|
||||||
sectionTwo.definitions = [
|
sectionTwo.definitions = [
|
||||||
getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one/", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
|
getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
|
||||||
getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
let sectionThree = AnalyticsCategory(id: "section_three")
|
let sectionThree = AnalyticsCategory(id: "section_three")
|
||||||
sectionThree.definitions = [
|
sectionThree.definitions = [
|
||||||
getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one/", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
|
||||||
getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -607,7 +607,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
|
|||||||
internal func logScreenS1DefOne() {
|
internal func logScreenS1DefOne() {
|
||||||
logScreen(
|
logScreen(
|
||||||
name: "s1 def one",
|
name: "s1 def one",
|
||||||
path: "s1_def_one/",
|
path: "s1_def_one",
|
||||||
params: nil
|
params: nil
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -626,7 +626,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
|
|||||||
internal func logScreenS2DefOne() {
|
internal func logScreenS2DefOne() {
|
||||||
logScreen(
|
logScreen(
|
||||||
name: "s2 def one",
|
name: "s2 def one",
|
||||||
path: "s2_def_one/",
|
path: "s2_def_one",
|
||||||
params: nil
|
params: nil
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -644,19 +644,19 @@ final class AnalyticsGeneratorTests: XCTestCase {
|
|||||||
// Given
|
// Given
|
||||||
let sectionOne = AnalyticsCategory(id: "section_one")
|
let sectionOne = AnalyticsCategory(id: "section_one")
|
||||||
sectionOne.definitions = [
|
sectionOne.definitions = [
|
||||||
getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one/", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
|
getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
|
||||||
getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
|
getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
let sectionTwo = AnalyticsCategory(id: "section_two")
|
let sectionTwo = AnalyticsCategory(id: "section_two")
|
||||||
sectionTwo.definitions = [
|
sectionTwo.definitions = [
|
||||||
getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one/", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
|
getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
|
||||||
getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
let sectionThree = AnalyticsCategory(id: "section_three")
|
let sectionThree = AnalyticsCategory(id: "section_three")
|
||||||
sectionThree.definitions = [
|
sectionThree.definitions = [
|
||||||
getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one/", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
|
||||||
getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
|
getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user