Server Confirmation Screen (#959)

* Add ServerConfirmationScreen.
2026-11-02 20:39:24 +00:00 · 2023-05-30 10:31:18 +01:00
parent 088ca622a1
commit 74b36ce870
56 changed files with 643 additions and 201 deletions
@@ -27,8 +27,13 @@ class AuthenticationCoordinatorUITests: XCTestCase {
        // Splash Screen: Tap get started button
        app.buttons[A11yIdentifiers.onboardingScreen.signIn].tap()
        
-        // Login Screen: Enter valid credentials
+        // Server Confirmation: Tap continue button
+        app.buttons[A11yIdentifiers.serverConfirmationScreen.continue].tap()
        
+        // Login Screen: Confirm password login is available and not OIDC.
+        XCTAssertFalse(app.buttons[A11yIdentifiers.loginScreen.oidc].exists, "The OIDC button shouldn't be shown before entering a supported homeserver.")
+        
+        // Login Screen: Enter valid credentials
        app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("alice\n")
        app.secureTextFields[A11yIdentifiers.loginScreen.password].clearAndTypeText("12345678")

@@ -47,6 +52,9 @@ class AuthenticationCoordinatorUITests: XCTestCase {
        // Splash Screen: Tap get started button
        app.buttons[A11yIdentifiers.onboardingScreen.signIn].tap()
        
+        // Server Confirmation: Tap continue button
+        app.buttons[A11yIdentifiers.serverConfirmationScreen.continue].tap()
+        
        // Login Screen: Enter invalid credentials
        app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("alice")
        app.secureTextFields[A11yIdentifiers.loginScreen.password].clearAndTypeText("87654321")
@@ -68,16 +76,16 @@ class AuthenticationCoordinatorUITests: XCTestCase {
        // Splash Screen: Tap get started button
        app.buttons[A11yIdentifiers.onboardingScreen.signIn].tap()
        
-        // Login Screen: Tap edit server button.
-        XCTAssertFalse(app.buttons[A11yIdentifiers.loginScreen.oidc].exists, "The OIDC button shouldn't be shown before entering a supported homeserver.")
-        app.buttons[A11yIdentifiers.loginScreen.changeServer].tap()
+        // Server Confirmation: Tap change server button
+        app.buttons[A11yIdentifiers.serverConfirmationScreen.changeServer].tap()
        
-        // Server Selection: Clear the default and enter OIDC server.
+        // Server Selection: Clear the default, enter OIDC server and continue.
        app.textFields[A11yIdentifiers.changeServerScreen.server].clearAndTypeText("company.com")
-        
-        // Dismiss server screen.
        app.buttons[A11yIdentifiers.changeServerScreen.continue].tap()
        
+        // Server Confirmation: Tap continue button
+        app.buttons[A11yIdentifiers.serverConfirmationScreen.continue].tap()
+        
        // Then the login form should be updated for OIDC.
        XCTAssertTrue(app.buttons[A11yIdentifiers.loginScreen.oidc].waitForExistence(timeout: 1), "The OIDC button should be shown after selecting a homeserver with OIDC.")
    }
@@ -0,0 +1,31 @@
+//
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import ElementX
+import XCTest
+
+@MainActor
+class ServerConfirmationScreenUITests: XCTestCase {
+    func testLoginScreen() async throws {
+        let app = Application.launch(.serverConfirmationLogin)
+        try await app.assertScreenshot(.serverConfirmationLogin)
+    }
+    
+    func testRegisterScreen() async throws {
+        let app = Application.launch(.serverConfirmationRegister)
+        try await app.assertScreenshot(.serverConfirmationRegister)
+    }
+}
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef8332a434d1ee1e8e477baab70db5f21b8e19dabdfec3cb37d8a58a07f2dfa3
-size 87407
+oid sha256:1b6651cc4e5a2ae82dbb0600df7ecb9b80fad83c5d93f4e19294ad812e4a0bff
+size 78763
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:231a54d4b7ee98698ec443cf557d6b6d43b200600a24961366e54aa1b05bd12b
-size 88208
+oid sha256:f101e9e5f108590affc8912d1232b9638ab043cb81b6caf07022db4119b9864c
+size 79639
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1c86458e7d69a865e1e99b31d6d36eb8ec50b4d9451c8bbcc94dbcd551b7438
-size 75711
+oid sha256:983a85ed153810102033ab63393860e34bfaafa93008221c7561917eeef2716e
+size 66743
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afba2a8d37741ade05717616b721d421867d51fa40992909ad0299fd7b0c9c6f
-size 88152
+oid sha256:f7c8ca16e04390ab80586512f5ec8bd2a93f7cf4f505e1e6eab655d716483413
+size 79966
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:511188a181af1da44b6887f85ccbb88d4e19117f2f87692cf442ce3373c19433
-size 85133
+oid sha256:97bad473cac0e9bcae904de1b96112bfd6fff8dfbb5d107aaf4beaadb929165d
+size 76505
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:292f2b8684d4db4b200b9aee8a2bdaa9d69d0d9f94145bb57048a3f2ffe1c5df
+size 85863
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62bf793cc8293609b80d153afac4f3c243d3b3fa3679ef75820c7acf87147d76
+size 91885
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b40ed44328119207df894a5617b29e2b7616b7642b8bc0a8cf1dcfa0551f2491
-size 96064
+oid sha256:47db5f8d5cdebe1168faab3ef6613a23ee8cae13cad8d777370f18847af63f5c
+size 84951
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:834ac755d94df5f3dbc9ac2fc8bfa2a8944e8dacbdc8e1230dc898ad18412c46
-size 97420
+oid sha256:3c4fd4f4937bc6f909ca22d0fd15fb58d7c24d48655e058b30532bc771c5266e
+size 85799
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dde7a3add93db5eff4bb7fcec66d43e2c467c25b514806f2d5812fb95995c79d
-size 77839
+oid sha256:2323bf954c479c1cba9da33d44389875c14538e357e933521b0de7c9c99c6a7f
+size 68073
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e14113da03d4f9ea05553836cfee5f24b002e98c7a771d11e28fe7b90016a2d8
-size 100246
+oid sha256:39f4e0c7d6659d6e0e650cc858bba9979b95d053a5d5504201b4f529ce87a3f3
+size 89379
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dcb69fb081682f8ca9601256b6d24cf1762439ae0d4a3e68ea399e8c2db5788
-size 94481
+oid sha256:dbadc064d77df8bbfc98a358257bab41732f4d9d56497ee66f03f97601edd87b
+size 82075
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2866f698cdc3b7374867990f0dbe7a3a60ea52194bccdc9286bf6f84e2cc7f2d
+size 99923
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2fbd0358f11397b58f8cd9d68ac75c51223423841a5da8b94b6cd0015c895b5
+size 107693
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ad9a2318453d554ae2ec43c985bbae6d5496d03561bf5759c9089592a334480
-size 92066
+oid sha256:64a2a32c9b523499e92fbbfebcddec89ae26b0569dda6e345f914597a89f86b5
+size 82328
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:709dbc0dcb03e61c72900b03f93491da3a8c43ff095b0f628d91b39ec06a94f1
-size 92694
+oid sha256:e61208f06ef5ee719317d35505fd98b5c81ee3e1bf59d5086154d3900647fe07
+size 83082
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4f95f61c63e0e14193fc1f21c439709508a1c46e54a95806d42f120a2dcf793
-size 79627
+oid sha256:4256cefea1560f7a604c2e1ff9a58095f4a7c90ea84cc1654a200f1499d4939b
+size 70140
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2b9a459a16931023f81443d6518581800edbc0d9dd7b198639cfe4e55ad5f2c
-size 107330
+oid sha256:7d5c56d3c46647226a54b38ac1b0cfa86bf52deb559cb634a0005c74f6b33424
+size 97924
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05a769fada47570430f9fc16381b01d77bfe3b7e1c950c553a5df3ed728b765f
-size 90286
+oid sha256:c0a9e9a97c725e42877c616482014e69cf0dbc324dc98d92bacee9fb8f6e954c
+size 80823
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af22b397f7a139a5ef98ec5d9d126f1422c785b8107cfb7fb446475d47cc86f3
+size 101298
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:feccad16655d8d39396580e69b0820f3a9700650d9875a5172758e96b6eafe09
+size 113232
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db846fed5cd2472e611beaee52b3e02cc1d70490427e5085bb5d37813924ee32
-size 114993
+oid sha256:17b4a3f72724ab291fdb14b532c108d74e19d9f101fb4e99bab445f4586fa1ce
+size 95224
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a58acc6d270e9398b0f638fbcd23a968fa88ef968cc5943d95b73cc4883e2a22
-size 116000
+oid sha256:13222b1627ac1ae250255b13eaafce2d4e8ff417f71e01466c122159232d1b53
+size 96170
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31e489f4fd821ccf142d0cd558e23d78b8bd72f5117b4d4dabc7c5b8efad2fc5
-size 93858
+oid sha256:3bf19067e1d8b000ffd6a5d081054953be94f7f15961d055ee4eac38868f3d0e
+size 74768
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbedad6a1bded0780796d5e4db07a2f94770cc551ec3e071e0ab89c728c8925b
-size 131905
+oid sha256:495068fcb3484f9b1329df608d84c217a019d12b812ebf8676f1987cada089db
+size 122325
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b58ab8bc33ee6ea79a2fd995a38896920e4aa64d19453bdc611365f5f63663c
-size 111471
+oid sha256:3d42363d02e2878306b1b0a52a01c4491ad746f1823b0067cb1801ff164d9ff1
+size 92285
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7162ab99e29f0cb25a3a11d954a259b4e249e4da21920e0d28dd9a72e0c1e76d
+size 133333
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3602380207e0162a6677d43b4f2125c6983a41e8a6711369109585ef8f47ae6b
+size 150495