Merge branch 'release-5.7.0'

kickstarter · Mar 29, 2023 · bc1112a · bc1112a
2 parents 70f3bd1 + 9d50446
commit bc1112a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Kickstarter-iOS/Features/ChangeEmail/Controller/ChangeEmailView.swift b/Kickstarter-iOS/Features/ChangeEmail/Controller/ChangeEmailView.swift
@@ -12,7 +12,7 @@ struct ChangeEmailView: View {
   @SwiftUI.Environment(\.defaultMinListRowHeight) var minListRow
   @FocusState private var focusField: FocusField?
   private let contentPadding = 12.0
-  @ObservedObject private var reactiveViewModel = ChangeEmailViewModel_SwiftUIIntegrationTest()
+  @ObservedObject private var reactiveViewModel = ChangeEmailViewModelSwiftUIIntegrationTest()
   @State private var retrievedEmailText = ""
   @State private var newEmailText = ""
   @State private var newPasswordText = ""

diff --git a/Kickstarter.xcodeproj/project.pbxproj b/Kickstarter.xcodeproj/project.pbxproj
@@ -510,7 +510,7 @@
 		70495690299D53ED00B273DF /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 7049568F299D53ED00B273DF /* SnapshotTesting */; };
 		7061848B29BE4CD8008F9941 /* MessageBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7061848829BE4C11008F9941 /* MessageBannerView.swift */; };
 		7061848D29BE577B008F9941 /* MessageBannerViewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7061848C29BE577B008F9941 /* MessageBannerViewViewModel.swift */; };
-		706656D729C7E72B00BAE7D4 /* ChangeEmailViewModel_SwiftUIIntegrationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706656D629C7E72B00BAE7D4 /* ChangeEmailViewModel_SwiftUIIntegrationTest.swift */; };
+		706656D729C7E72B00BAE7D4 /* ChangeEmailViewModelSwiftUIIntegrationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706656D629C7E72B00BAE7D4 /* ChangeEmailViewModelSwiftUIIntegrationTest.swift */; };
 		70B1889429A521000004E293 /* FacebookResetPasswordViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B1889329A521000004E293 /* FacebookResetPasswordViewControllerTests.swift */; };
 		770187C022FDCFCA0019129D /* PledgeViewControllerMessageDisplaying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 770187BE22FDCF960019129D /* PledgeViewControllerMessageDisplaying.swift */; };
 		7703B42223217D4F00169EF3 /* EnvironmentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7703B42123217D4F00169EF3 /* EnvironmentType.swift */; };
@@ -2107,7 +2107,7 @@
 		701160D2291ECB250095BF24 /* LoadingBarButtonItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingBarButtonItem.swift; sourceTree = "<group>"; };
 		7061848829BE4C11008F9941 /* MessageBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBannerView.swift; sourceTree = "<group>"; };
 		7061848C29BE577B008F9941 /* MessageBannerViewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBannerViewViewModel.swift; sourceTree = "<group>"; };
-		706656D629C7E72B00BAE7D4 /* ChangeEmailViewModel_SwiftUIIntegrationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeEmailViewModel_SwiftUIIntegrationTest.swift; sourceTree = "<group>"; };
+		706656D629C7E72B00BAE7D4 /* ChangeEmailViewModelSwiftUIIntegrationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeEmailViewModelSwiftUIIntegrationTest.swift; sourceTree = "<group>"; };
 		70B1889329A521000004E293 /* FacebookResetPasswordViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FacebookResetPasswordViewControllerTests.swift; sourceTree = "<group>"; };
 		770187BE22FDCF960019129D /* PledgeViewControllerMessageDisplaying.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PledgeViewControllerMessageDisplaying.swift; sourceTree = "<group>"; };
 		7703B42123217D4F00169EF3 /* EnvironmentType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentType.swift; sourceTree = "<group>"; };
@@ -6600,7 +6600,7 @@
 				7727494623FC66EA0065E9F2 /* CategorySelectionViewModel.swift */,
 				77D19FF12406D5A40058FC8E /* CategorySelectionViewModelTests.swift */,
 				D6DC653221768B6E008CF69C /* ChangeEmailViewModel.swift */,
-				706656D629C7E72B00BAE7D4 /* ChangeEmailViewModel_SwiftUIIntegrationTest.swift */,
+				706656D629C7E72B00BAE7D4 /* ChangeEmailViewModelSwiftUIIntegrationTest.swift */,
 				D6ED1B36216D0C64007F7547 /* ChangeEmailViewModelTests.swift */,
 				D04AAC0A218BB70800CF713E /* ChangePasswordViewModel.swift */,
 				D04AAC13218BB70A00CF713E /* ChangePasswordViewModelTests.swift */,
@@ -7823,7 +7823,7 @@
 				D6534D3A22E7878D00E9D279 /* CreditCard+Utils.swift in Sources */,
 				A75511601C8642C3005355CF /* GradientView.swift in Sources */,
 				A7CC13D31D00E6CF00035C52 /* FindFriendsFacebookConnectCellViewModel.swift in Sources */,
-				706656D729C7E72B00BAE7D4 /* ChangeEmailViewModel_SwiftUIIntegrationTest.swift in Sources */,
+				706656D729C7E72B00BAE7D4 /* ChangeEmailViewModelSwiftUIIntegrationTest.swift in Sources */,
 				A75511611C8642C3005355CF /* Language.swift in Sources */,
 				373AB222222A058600769FC2 /* CreatePasswordViewModel.swift in Sources */,
 				A7F441E71D005A9400FE6FC5 /* ThanksViewModel.swift in Sources */,

diff --git a/...ailViewModel_SwiftUIIntegrationTest.swift → ...mailViewModelSwiftUIIntegrationTest.swift b/...ailViewModel_SwiftUIIntegrationTest.swift → ...mailViewModelSwiftUIIntegrationTest.swift
@@ -4,13 +4,13 @@ import Prelude
 import ReactiveSwift
 import UIKit
 
-public protocol ChangeEmailViewModelInputs_SwiftUIIntegrationTest {
+public protocol ChangeEmailViewModelInputsSwiftUIIntegrationTest {
   func resendVerificationEmailButtonTapped()
   func viewDidLoad()
   func updateEmail(newEmail: String, currentPassword: String)
 }
 
-public protocol ChangeEmailViewModelOutputs_SwiftUIIntegrationTest {
+public protocol ChangeEmailViewModelOutputsSwiftUIIntegrationTest {
   var didFailToSendVerificationEmail: Signal<String, Never> { get }
   var didSendVerificationEmail: Signal<Void, Never> { get }
   var emailText: Signal<String, Never> { get }
@@ -21,14 +21,14 @@ public protocol ChangeEmailViewModelOutputs_SwiftUIIntegrationTest {
   var verificationEmailButtonTitle: Signal<String, Never> { get }
 }
 
-public protocol ChangeEmailViewModelType_SwiftUIIntegrationTest {
-  var inputs: ChangeEmailViewModelInputs_SwiftUIIntegrationTest { get }
-  var outputs: ChangeEmailViewModelOutputs_SwiftUIIntegrationTest { get }
+public protocol ChangeEmailViewModelTypeSwiftUIIntegrationTest {
+  var inputs: ChangeEmailViewModelInputsSwiftUIIntegrationTest { get }
+  var outputs: ChangeEmailViewModelOutputsSwiftUIIntegrationTest { get }
 }
 
-public final class ChangeEmailViewModel_SwiftUIIntegrationTest: ChangeEmailViewModelType_SwiftUIIntegrationTest,
-  ChangeEmailViewModelInputs_SwiftUIIntegrationTest,
-  ChangeEmailViewModelOutputs_SwiftUIIntegrationTest, ObservableObject {
+public final class ChangeEmailViewModelSwiftUIIntegrationTest: ChangeEmailViewModelTypeSwiftUIIntegrationTest,
+  ChangeEmailViewModelInputsSwiftUIIntegrationTest,
+  ChangeEmailViewModelOutputsSwiftUIIntegrationTest, ObservableObject {
   private var cancellables = Set<AnyCancellable>()
   @Published public var hideVerifyView = false
   @Published public var verifyEmailButtonTitle = ""
@@ -251,11 +251,11 @@ public final class ChangeEmailViewModel_SwiftUIIntegrationTest: ChangeEmailViewM
   public let verificationEmailButtonTitle: Signal<String, Never>
   public let warningMessageLabelHidden: Signal<Bool, Never>
 
-  public var inputs: ChangeEmailViewModelInputs_SwiftUIIntegrationTest {
+  public var inputs: ChangeEmailViewModelInputsSwiftUIIntegrationTest {
     return self
   }
 
-  public var outputs: ChangeEmailViewModelOutputs_SwiftUIIntegrationTest {
+  public var outputs: ChangeEmailViewModelOutputsSwiftUIIntegrationTest {
     return self
   }
 }