Skip to content

UI Tests - Contacts #487

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

Merged
tomholub merged 16 commits into from
Sep 10, 2021
+46 −42
Merged

UI Tests - Contacts #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d8b50c
Update UI tests
Kharchevskyi Aug 26, 2021
4b9eb4e
UI tests for user with no messages
Kharchevskyi Aug 26, 2021
c6f288a
Add ui test to verify after app restart
Kharchevskyi Aug 27, 2021
3a72b74
Add ui test for login with bad pass phrase
Kharchevskyi Aug 30, 2021
ddb0bbc
PR fixes
Kharchevskyi Aug 31, 2021
782a6b8
rename AttContext, minor fixes
Kharchevskyi Aug 31, 2021
5059448
Add UI tests for search functionality
Kharchevskyi Aug 31, 2021
94d75b3
issue #474 Add FlowCryptUITests to swiftformat (#477)
Kharchevskyi Sep 2, 2021
9611de2
Merge master
Kharchevskyi Sep 4, 2021
162f9bc
Merge branch 'feature/ui-tests-search' of github.com:FlowCrypt/flowcr…
Kharchevskyi Sep 4, 2021
c0cc593
Revive ui test send message withou pub key
Kharchevskyi Sep 4, 2021
c9148cf
Add test for sign in with wrong credentials
Kharchevskyi Sep 4, 2021
6a797c3
Work on ui test to check contacts functionality
Kharchevskyi Sep 4, 2021
0a98689
Merge master
Kharchevskyi Sep 8, 2021
92920fb
Fix conflicts
Kharchevskyi Sep 8, 2021
0c8d81a
Finalize contacts ui test
Kharchevskyi Sep 9, 2021
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
6 changes: 4 additions & 2 deletions FlowCrypt/Controllers/Settings/Contacts/Contacts List/ContactsListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,16 @@ extension ContactsListViewController: ASTableDelegate, ASTableDataSource {
}

func tableNode(_: ASTableNode, nodeBlockForRowAt indexPath: IndexPath) -> ASCellNodeBlock {
{ [weak self] in
return { [weak self] in
guard let self = self else { return ASCellNode() }
return ContactCellNode(
input: self.decorator.contactNodeInput(with: self.contacts[indexPath.row]),
action: { [weak self] in
self?.handleDeleteButtonTap(with: indexPath)
}
)
).then {
$0.accessibilityLabel = "\(indexPath.row)"
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions FlowCrypt/Functionality/Services/Contacts Services/LocalContactsProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ extension LocalContactsProvider: LocalContactsProviderType {
}

func getAllContacts() -> [Contact] {
Array(storage()
.objects(ContactObject.self)
.map(Contact.init)
Array(
storage()
.objects(ContactObject.self)
.map(Contact.init)
.sorted(by: { $0.email > $1.email })
)
}
}
74 changes: 37 additions & 37 deletions FlowCryptUITests/SignInImapTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,43 +313,43 @@ class SignInImapTest: XCTestCase, AppTest {

// restart app -> verify contacts functionality
func test_9_restart_app_contacts() {
// let application = XCUIApplication()
// let tablesQuery = application.tables
// app.buttons["+"].tap()
// app.typeText(UserCredentials.imapDev.email)
// goKeyboardButton.tap()
// wait(2)
//
// tablesQuery.textFields["Add Recipient"].tap()
// wait(1)
// app.typeText(UserCredentials.imapDenBond.email)
// wait(1)
// goKeyboardButton.tap()
// wait(1)
//
// navigationBackButton.tap()
//
// application.navigationBars["Inbox"].buttons["menu icn"].tap()
// tablesQuery.staticTexts["Settings"].tap()
// tablesQuery.staticTexts["Contacts"].tap()
//
// // open first contacts
// let app = XCUIApplication()
// let contactsQuery = app.tables
// contactsQuery.staticTexts["default@flowcrypt.test"].tap()
// XCTAssert(contactsQuery.staticTexts["default@flowcrypt.test"].exists)
// XCTAssert(contactsQuery.staticTexts["225F8023C20D0957,\n4F1458BD22B7BB53"].exists)
// XCTAssert(contactsQuery.staticTexts["3DEBE9F677D5B9BB38E5A244225F8023C20D0957,\nF81D1B0FDEE37AA32B8F0CD04F1458BD22B7BB53"].exists)
// XCTAssert(contactsQuery.staticTexts["eddsa"].exists)
// application.navigationBars["Public Key"].buttons["arrow left c"].tap()
//
// // open next contact
// contactsQuery.staticTexts["denbond7@flowcrypt.test"].tap()
// XCTAssert(contactsQuery.staticTexts["default@flowcrypt.test"].exists)
// XCTAssert(contactsQuery.staticTexts["C32089CD6AF8D6CE,\nD7A3DEDB65CB1EFB"].exists)
// XCTAssert(contactsQuery.staticTexts["Apr 30, 2021 at 8:57:44 AM"].exists)
// XCTAssert(contactsQuery.staticTexts["eddsa"].exists)
}
let application = XCUIApplication()
let tablesQuery = application.tables
app.buttons["+"].tap()

app.typeText(UserCredentials.imapDev.email)
goKeyboardButton.tap()
wait(2)

tablesQuery.textFields["Add Recipient"].tap()
wait(1)
app.typeText(UserCredentials.imapDenBond.email)
wait(1)
goKeyboardButton.tap()
wait(1)

navigationBackButton.tap()

application.navigationBars["Inbox"].buttons["menu icn"].tap()
tablesQuery.staticTexts["Settings"].tap()
tablesQuery.staticTexts["Contacts"].tap()

wait(1)

tablesQuery.otherElements["0"].firstMatch.tap()
app.tables.staticTexts["denbond7@flowcrypt.test"].tap()
XCTAssert(app.tables.staticTexts["default@flowcrypt.test"].exists)
XCTAssert(app.tables.staticTexts["C32089CD6AF8D6CE,\nD7A3DEDB65CB1EFB"].exists)
XCTAssert(app.tables.staticTexts["eddsa"].exists)
app.navigationBars["Public Key"].buttons["arrow left c"].tap()

tablesQuery.otherElements["1"].firstMatch.tap()
XCTAssert(app.tables.staticTexts["default@flowcrypt.test"].exists)
XCTAssert(app.tables.staticTexts["225F8023C20D0957,\n4F1458BD22B7BB53"].exists)
XCTAssert(app.tables.staticTexts["3DEBE9F677D5B9BB38E5A244225F8023C20D0957,\nF81D1B0FDEE37AA32B8F0CD04F1458BD22B7BB53"].exists)
XCTAssert(app.tables.staticTexts["eddsa"].exists)
application.navigationBars["Public Key"].buttons["arrow left c"].tap()
}

// try to sign in with wrong credentials
func test_9_sign_in_with_wrong_credentials() {
Expand Down