From 77bdc69ba0c5f6cc1bed9c1b94eb3db23b6aa6b1 Mon Sep 17 00:00:00 2001
From: Anna <55500846+annapiktas@users.noreply.github.com>
Date: Fri, 15 Jan 2021 09:59:21 +0000
Subject: [PATCH] Feature/issue57/add assert alert body (#145)

* Added alert to Other page, message function to to assert the message, test for checking alert message

* Merged develop in

* Updated Changelog & Readme

* Update CHANGELOG.md

Co-authored-by: Roger TAN <roger-tan@users.noreply.github.com>

* Delete IDEWorkspaceChecks.plist

* Fixing storyboard for XCode 10

- Storyboard no more crash on Xcode10

Co-authored-by: Anna Piktas <anna.piktas.external@ynap.com>
Co-authored-by: Roger TAN <roger-tan@users.noreply.github.com>
Co-authored-by: Marco Guerrieri <marco.guerrieri@theappbusiness.com>
---
 CHANGELOG.md                                  |  1 +
 Example/TABTestKit/Base.lproj/Main.storyboard | 19 +++++++++++++------
 .../TABTestKit/OtherElementsController.swift  | 11 +++++++++++
 .../OtherElementsScreen.swift                 |  2 ++
 .../OtherElementsTests.swift                  | 13 +++++++++++++
 README.md                                     |  5 +++++
 .../Classes/Contexts/AlertContext.swift       |  3 +++
 TABTestKit/Classes/Elements/Alert.swift       |  4 +++-
 8 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb9b9789..ed6ea246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     - Added `carthage.sh` to fix the issue with duplicated architecture when Carthage needs to build with Xcode 12.0
 - Fixed Carthage issue to allow `Biometics` framework to be seperated from TABTestKit as the same of SwiftPM
 - Fixed a timezone issue on TestExample when switching from Summer Time to Winter Time. We make sure that the DatePicker are now always in UTC Timezone
+- Added a method to assert the alert message
 - Added assert for tab bar tab count
 
 ---
diff --git a/Example/TABTestKit/Base.lproj/Main.storyboard b/Example/TABTestKit/Base.lproj/Main.storyboard
index 5dc8dc24..3c908251 100644
--- a/Example/TABTestKit/Base.lproj/Main.storyboard
+++ b/Example/TABTestKit/Base.lproj/Main.storyboard
@@ -161,18 +161,25 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qtX-qz-K6y">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qtX-qz-K6y">
                                                 <rect key="frame" x="20" y="56.5" width="335" height="30"/>
                                                 <state key="normal" title="Example button"/>
                                                 <connections>
                                                     <action selector="buttonTapped" destination="jT9-QJ-sAL" eventType="touchUpInside" id="hhd-Ly-GM8"/>
                                                 </connections>
                                             </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xdr-1c-3so">
+                                                <rect key="frame" x="20" y="102.5" width="335" height="30"/>
+                                                <state key="normal" title="Alert button"/>
+                                                <connections>
+                                                    <action selector="buttonAlertTapped" destination="jT9-QJ-sAL" eventType="touchUpInside" id="4Gz-wK-tff"/>
+                                                </connections>
+                                            </button>
                                             <view contentMode="scaleToFill" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="kY2-0d-g5B">
-                                                <rect key="frame" x="20" y="102.5" width="335" height="28"/>
+                                                <rect key="frame" x="20" y="148.5" width="335" height="31"/>
                                                 <subviews>
                                                     <segmentedControl opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Lbh-uE-7oV">
-                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="29"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="32"/>
                                                         <segments>
                                                             <segment title="First"/>
                                                             <segment title="Second"/>
@@ -290,8 +297,8 @@
                                                     <!--2007-01-09 09:41:00 +0000-->
                                                 </date>
                                             </datePicker>
-                                            <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" minuteInterval="1" style="wheels" useCurrentDate="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wph-qF-GtI">
-                                                <rect key="frame" x="20" y="1327.5" width="335" height="216"/>
+                                            <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" style="wheels" useCurrentDate="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wph-qF-GtI">
+                                                <rect key="frame" x="20" y="1410" width="335" height="216"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="216" id="nBS-T0-mn3"/>
                                                 </constraints>
@@ -415,7 +422,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z4D-6q-tVm">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z4D-6q-tVm">
                                 <rect key="frame" x="166.5" y="605" width="42" height="30"/>
                                 <state key="normal" title="Log in"/>
                                 <connections>
diff --git a/Example/TABTestKit/OtherElementsController.swift b/Example/TABTestKit/OtherElementsController.swift
index 5f374cb6..da88b628 100644
--- a/Example/TABTestKit/OtherElementsController.swift
+++ b/Example/TABTestKit/OtherElementsController.swift
@@ -73,6 +73,17 @@ final class OtherElementsController: UIViewController {
     present(sheet, animated: true)
   }
   
+    @IBAction func buttonAlertTapped() {
+        let alertController = UIAlertController(title: "Alert title", message: "Alert Message", preferredStyle: .alert)
+        
+        let dismissAction = UIAlertAction(title: "Dismiss", style: .cancel, handler: { _ in
+            alertController.dismiss(animated: true)
+        })
+        
+        alertController.addAction(dismissAction)
+        
+        present(alertController, animated: true)
+    }
 }
 
 extension OtherElementsController: UITextFieldDelegate {
diff --git a/Example/TABTestKit_ExampleUITests/OtherElementsScreen.swift b/Example/TABTestKit_ExampleUITests/OtherElementsScreen.swift
index e960a439..31f721f8 100644
--- a/Example/TABTestKit_ExampleUITests/OtherElementsScreen.swift
+++ b/Example/TABTestKit_ExampleUITests/OtherElementsScreen.swift
@@ -16,6 +16,7 @@ struct OtherElementsScreen: Screen {
     let scrollView = ScrollView(id: "MyScrollView") // In iOS 13, XCUI matches a hidden scroll view when the keyboard is showing :(
     let label = Label(id: "Example label")
     let button = Button(id: "Example button")
+    let alertButton = Button(id: "Alert button")
     let segmentedControl = SegmentedControl(parent: View(id: "ExampleSegmentedControl"))
     let textField = TextField(id: "ExampleTextField")
     let numberPadTextField = TextField(id: "NumberPadTextField")
@@ -38,6 +39,7 @@ struct OtherElementsScreen: Screen {
     let dateTimePicker = DatePicker(id: "ExampleDateTimePicker")
     let countdownTimerPicker = DatePicker(id: "ExampleCountDownTimerPicker")
     let shareSheet = ActivitySheet()
+    let alert = Alert(id: "Alert title", message: "Alert message", dismissButtonID: "Dismiss")
     
 }
 
diff --git a/Example/TABTestKit_ExampleUITests/OtherElementsTests.swift b/Example/TABTestKit_ExampleUITests/OtherElementsTests.swift
index 4fee61cc..75fff1e0 100644
--- a/Example/TABTestKit_ExampleUITests/OtherElementsTests.swift
+++ b/Example/TABTestKit_ExampleUITests/OtherElementsTests.swift
@@ -40,6 +40,19 @@ final class OtherElementsTests: TABTestCase, SystemPreferencesContext {
             And(I: see(otherElementsScreen))
         }
         
+        Scenario("Asserting the alert message") {
+            Given(I: see(otherElementsScreen.alertButton))
+            And(I: tap(otherElementsScreen.alertButton))
+            Then(I: see(otherElementsScreen.alert))
+            And(the: message(in: otherElementsScreen.alert, is: "Alert message"))
+        }
+
+        Scenario("Dismissing the alert") {
+            Given(I: see(otherElementsScreen.alert))
+            When(I: tap(otherElementsScreen.alert.dismissButton))
+            Then(I: see(otherElementsScreen))
+        }
+        
         Scenario("Seeing and interacting with the segmented control") {
             Given(I: see(otherElementsScreen.segmentedControl))
             Then(I: tap(otherElementsScreen.segmentedControl.button(withID: "Second")))
diff --git a/README.md b/README.md
index 41f9b6cb..d12aab29 100644
--- a/README.md
+++ b/README.md
@@ -1485,6 +1485,11 @@ tap("OK", in: myScreen.alert)
 
 Given(I: tap("OK", in: myScreen.alert))
 ```
+```swift
+message(in: myScreen.alert, is: "Alert message")
+
+Then(the: message(in: myScreen.alert, is: "Alert message"))
+```
 
 #### SheetContext
 
diff --git a/TABTestKit/Classes/Contexts/AlertContext.swift b/TABTestKit/Classes/Contexts/AlertContext.swift
index dbb82044..31d6edd2 100644
--- a/TABTestKit/Classes/Contexts/AlertContext.swift
+++ b/TABTestKit/Classes/Contexts/AlertContext.swift
@@ -14,4 +14,7 @@ public extension AlertContext {
 		alert.actionButton(withID: actionButtonID).tap()
 	}
 	
+	func message(in alert: Alert, is message: String) {
+		XCTAssertEqual(alert.message, message)
+	}
 }
diff --git a/TABTestKit/Classes/Elements/Alert.swift b/TABTestKit/Classes/Elements/Alert.swift
index e5596074..938bda81 100644
--- a/TABTestKit/Classes/Elements/Alert.swift
+++ b/TABTestKit/Classes/Elements/Alert.swift
@@ -13,6 +13,7 @@ public struct Alert: Element {
 	
 	public let id: String?
 	public let parent: Element
+	public let message: String?
 	public let type: XCUIElement.ElementType = .alert
 	public var dismissButton: Button {
 		return Button(id: dismissButtonID, parent: self)
@@ -20,8 +21,9 @@ public struct Alert: Element {
 	
 	private let dismissButtonID: String
 	
-	public init(id: String?, parent: Element = App.shared, dismissButtonID: String = "Cancel") {
+	public init(id: String?, message: String? = nil, parent: Element = App.shared, dismissButtonID: String = "Cancel") {
 		self.id = id
+		self.message = message
 		self.parent = parent
 		self.dismissButtonID = dismissButtonID
 	}