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

Removes VPN waitlist and beta code #801

Merged
merged 16 commits into from
May 24, 2024
Merged

Removes VPN waitlist and beta code #801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea01cbe
Removes VPN waitlist and beta code
diegoreymendez Apr 26, 2024
3965d2c
Removes waitlist info
diegoreymendez Apr 26, 2024
7bd1df4
Fixes some swiftlint annoyance
diegoreymendez Apr 26, 2024
cc289ac
Trying to fix swiftlint
diegoreymendez Apr 26, 2024
13753f7
Finally fixes swiftlint crazyness
diegoreymendez Apr 26, 2024
55ac996
Merge branch 'main' into diego/remove-waitlist-code
diegoreymendez May 14, 2024
d3f0db7
Fixes some unit tests and errors
diegoreymendez May 14, 2024
6821ee5
Fixes a BSK test
diegoreymendez May 14, 2024
985be1a
Merge branch 'main' into diego/remove-waitlist-code
quanganhdo May 22, 2024
a930b6f
Merge branch 'main' into diego/remove-waitlist-code
quanganhdo May 23, 2024
7b4f4c5
Merge branch 'main' into diego/remove-waitlist-code
quanganhdo May 23, 2024
0463f58
Revert "Autofill engagement KPIs for pixel reporting (#830)"
quanganhdo May 23, 2024
bf35532
Reapply "Autofill engagement KPIs for pixel reporting (#830)"
quanganhdo May 23, 2024
8d58961
Fix unit tests
quanganhdo May 23, 2024
884734a
Merge branch 'main' into diego/remove-waitlist-code
samsymons May 24, 2024
7be3109
Fix SwiftLint.
samsymons May 24, 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
Prev Previous commit
Next Next commit
Removes waitlist info
  • Loading branch information
@diegoreymendez
diegoreymendez committed Apr 26, 2024
commit 3965d2cdf3725fc3718c9e8e1ebc17c778faead3
2 changes: 0 additions & 2 deletions Sources/RemoteMessaging/Mappers/JsonToRemoteMessageModelMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ private enum AttributesKey: String, CaseIterable {
case favorites
case appTheme
case daysSinceInstalled
case isNetPWaitlistUser
case daysSinceNetPEnabled

func matchingAttribute(jsonMatchingAttribute: AnyDecodable) -> MatchingAttribute {
Expand All @@ -56,7 +55,6 @@ private enum AttributesKey: String, CaseIterable {
case .favorites: return FavoritesMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
case .appTheme: return AppThemeMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
case .daysSinceInstalled: return DaysSinceInstalledMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
case .isNetPWaitlistUser: return IsNetPWaitlistUserMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
case .daysSinceNetPEnabled: return DaysSinceNetPEnabledMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
}
}
Expand Down
25 changes: 0 additions & 25 deletions Sources/RemoteMessaging/Model/MatchingAttributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,31 +608,6 @@ struct RangeStringNumericMatchingAttribute: Equatable {
}
}

struct IsNetPWaitlistUserMatchingAttribute: MatchingAttribute, Equatable {
var value: Bool?
var fallback: Bool?

init(jsonMatchingAttribute: AnyDecodable) {
guard let jsonMatchingAttribute = jsonMatchingAttribute.value as? [String: Any] else { return }

if let value = jsonMatchingAttribute[RuleAttributes.value] as? Bool {
self.value = value
}
if let fallback = jsonMatchingAttribute[RuleAttributes.fallback] as? Bool {
self.fallback = fallback
}
}

init(value: Bool?, fallback: Bool?) {
self.value = value
self.fallback = fallback
}

static func == (lhs: IsNetPWaitlistUserMatchingAttribute, rhs: IsNetPWaitlistUserMatchingAttribute) -> Bool {
return lhs.value == rhs.value && lhs.fallback == rhs.fallback
}
}

struct DaysSinceNetPEnabledMatchingAttribute: MatchingAttribute, Equatable {
var min: Int = MatchingAttributeDefaults.intDefaultValue
var max: Int = MatchingAttributeDefaults.intDefaultMaxValue
Expand Down
4 changes: 0 additions & 4 deletions .../BrowserServicesKitTests/RemoteMessaging/Mappers/JsonToRemoteConfigModelMapperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ class JsonToRemoteConfigModelMapperTests: XCTestCase {
attribs = rule8?.value.filter { $0 is DaysSinceNetPEnabledMatchingAttribute }
XCTAssertEqual(attribs?.count, 1)
XCTAssertEqual(attribs?.first as? DaysSinceNetPEnabledMatchingAttribute, DaysSinceNetPEnabledMatchingAttribute(min: 5, fallback: nil))

attribs = rule8?.value.filter { $0 is IsNetPWaitlistUserMatchingAttribute }
XCTAssertEqual(attribs?.count, 1)
XCTAssertEqual(attribs?.first as? IsNetPWaitlistUserMatchingAttribute, IsNetPWaitlistUserMatchingAttribute(value: true, fallback: nil))
}

func testWhenJsonMessagesHaveUnknownTypesThenMessagesNotMappedIntoConfig() throws {
Expand Down
10 changes: 0 additions & 10 deletions Tests/BrowserServicesKitTests/RemoteMessaging/Matchers/UserAttributeMatcherTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
favoritesCount: 88,
appTheme: "default",
isWidgetInstalled: true,
isNetPWaitlistUser: true,

Check failure on line 56 in Tests/BrowserServicesKitTests/RemoteMessaging/Matchers/UserAttributeMatcherTests.swift

View workflow job for this annotation

GitHub Actions / Run unit tests (iOS) 

extra argument 'isNetPWaitlistUser' in call
daysSinceNetPEnabled: 3)
}

Expand Down Expand Up @@ -207,16 +207,6 @@

// MARK: - Network Protection Waitlist

func testWhenIsNetPWaitlistUserMatchesThenReturnMatch() throws {
XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: IsNetPWaitlistUserMatchingAttribute(value: true, fallback: nil)),
.match)
}

func testWhenIsNetPWaitlistUserDoesNotMatchThenReturnFail() throws {
XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: IsNetPWaitlistUserMatchingAttribute(value: false, fallback: nil)),
.fail)
}

func testWhenDaysSinceNetPEnabledMatchesThenReturnMatch() throws {
XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: DaysSinceNetPEnabledMatchingAttribute(min: 1, fallback: nil)),
.match)
Expand Down
4 changes: 0 additions & 4 deletions Tests/BrowserServicesKitTests/RemoteMessaging/RemoteMessagingConfigMatcherTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: []
)
Expand Down Expand Up @@ -113,7 +112,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: [])

Expand Down Expand Up @@ -182,7 +180,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: ["1"])

Expand Down Expand Up @@ -212,7 +209,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: [])

Expand Down
2 changes: 0 additions & 2 deletions Tests/BrowserServicesKitTests/RemoteMessaging/RemoteMessagingConfigProcessorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class RemoteMessagingConfigProcessorTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: []
)
Expand Down Expand Up @@ -64,7 +63,6 @@ class RemoteMessagingConfigProcessorTests: XCTestCase {
favoritesCount: 0,
appTheme: "light",
isWidgetInstalled: false,
isNetPWaitlistUser: false,
daysSinceNetPEnabled: -1),
dismissedMessageIds: [])

Expand Down
3 changes: 0 additions & 3 deletions Tests/BrowserServicesKitTests/Resources/remote-messaging-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,6 @@
{
"id": 8,
"attributes": {
"isNetPWaitlistUser": {
"value": true
},
samsymons marked this conversation as resolved.
Show resolved Hide resolved
"daysSinceNetPEnabled": {
"min": 5
}
Expand Down
Loading