Commit `4e67adb664`

4e67adb664b1f6c7461c21b333b56ab5f3232f22

parent: 3de1ec4d23

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-19 16:16 UTC

Run the live smoke suite as the ios-smoke account

The suite no longer depends on a personal account: the scratch repo,
the edit fixture, the org member row, the PGP UID and the profile
description all come from a dedicated ios-smoke user (a krz admin).
gitbayUITests/smoke-account.sh provisions it and seeds
ios-smoke/ui-smoke-edit; cmc/ui-smoke-edit is gone. The iPad
screenshot checkpoint now waits for the profile edit button instead of
a specific description, so store screenshots can still be taken as a
real user.

Layout: unified · split

README.org +15

	@@ -79,6 +79,21 @@ xcodebuild -project gitbay.xcodeproj -scheme gitbay \
79	-destination 'platform=iOS Simulator,name=iPhone 17' test	79	-destination 'platform=iOS Simulator,name=iPhone 17' test
80	#+end_src	80	#+end_src
81		81
		82	The suite runs as the =ios-smoke= account, not a personal one: it owns the
		83	scratch and fixture repositories and is an admin of =krz=. An instance admin
		84	provisions it once with =gitbayUITests/smoke-account.sh=, which also writes the
		85	account's SSH key to =~/.ssh/gitbay-ios-smoke=. The token above is minted with
		86	that key:
		87
		88	#+begin_src sh
		89	ssh -i ~/.ssh/gitbay-ios-smoke -o IdentitiesOnly=yes -o ControlPath=none \
		90	git@gitbay.org token create --name ui-smoke --scope full --ttl 30d
		91	#+end_src
		92
		93	Setup signs in only when it finds the token screen, so a simulator signed in as
		94	another account has to be signed out first (=xcrun simctl keychain <device>
		95	reset= while the app is not running).
		96
82	* Contributing	97	* Contributing
83		98
84	To contribute, create a merge request with your changes:	99	To contribute, create a merge request with your changes:

gitbayUITests/LiveSmokeUITests.swift +32 −20

 ///     TEST_RUNNER_GITBAY_UITEST_LIVE=1 xcodebuild test \
 ///       -only-testing:gitbayUITests ...
 ///
-/// They assume the simulator is already signed in as an account that can
+/// They run as the `ios-smoke` account, a krz admin that owns the
-/// write to krz/gitbay-ios, and that branch `ui-smoke` exists.
+/// scratch and fixture repositories (smoke-account.sh provisions it), and
+/// assume branch `ui-smoke` exists on krz/gitbay-ios. A signed-out device
+/// is signed in at setUp from TEST_RUNNER_GITBAY_UITEST_TOKEN.
 final class LiveSmokeUITests: XCTestCase {
     private var app: XCUIApplication!
     /// because the name is taken, which reads like a UI bug and is not.
     /// Removed before and after, so neither a crashed run nor this one
     /// can strand it.
-    private static let scratchRepo = "cmc/ui-smoke"
+    private static let scratchRepo = "\(smokeUser)/ui-smoke"
+    /// The account the suite runs as. smoke-account.sh creates it with
+    /// the profile description, PGP key and fixture repository the
+    /// assertions below read back.
+    static let smokeUser = "ios-smoke"
+    static let smokeProfileDescription = "Live UI smoke account for gitbay-ios"
+    static let smokePGPEmail = "ios-smoke+pgp@gitbay.org"
+    static let editRepo = "\(smokeUser)/ui-smoke-edit"
     override func setUpWithError() throws {
         try XCTSkipUnless(
     /// The edit flow saves a change to a real file. Seeding a
     /// repository's first commit is a push, which no test can make, so
     /// this only checks — and says why, rather than failing later at
-    /// "cmc/ui-smoke-edit not in the repo list".
+    /// "ios-smoke/ui-smoke-edit not in the repo list".
     private func requireFixtureRepo() throws {
-        guard let data = readCommand(["repo", "show", "cmc/ui-smoke-edit"]),
+        guard let data = readCommand(["repo", "show", Self.editRepo]),
               let envelope = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
         else { return } // no token, or the instance is unreachable
         try XCTSkipUnless(envelope["data"] != nil, """
-            cmc/ui-smoke-edit is missing. The edit flow saves a change to \
+            \(Self.editRepo) is missing. The edit flow saves a change to \
-            notes.txt in it; recreate the repo with that file (see its \
+            notes.txt in it; gitbayUITests/smoke-account.sh seeds it (or \
-            README) and run again.
+            push it by hand, see that script) and run again.
             """)
     }
         let createSearch = app.searchFields.firstMatch
         XCTAssertTrue(createSearch.waitForExistence(timeout: 10))
         focusAndType(createSearch, "ui-smoke")
-        XCTAssertTrue(app.staticTexts["cmc/ui-smoke"].firstMatch
+        XCTAssertTrue(app.staticTexts[Self.scratchRepo].firstMatch
             .waitForExistence(timeout: 15), "created repo not in the list")
         // --- access: grant a user on the scratch repo, then revoke ---
-        app.staticTexts["cmc/ui-smoke"].firstMatch.tap()
+        app.staticTexts[Self.scratchRepo].firstMatch.tap()
         XCTAssertTrue(app.staticTexts["Files"].firstMatch.waitForExistence(timeout: 10))
         app.staticTexts["Settings"].firstMatch.tap()
         let grantUser = app.descendants(matching: .any)
         // --- rename the scratch repo there and back ---
         // Each rename pushes the renamed repository; the round-trip ends
-        // on cmc/ui-smoke again, several screens deep.
+        // on the scratch repo again, several screens deep.
         var firstRename = true
         let rename: (String, String) -> Void = { newName, expectedPath in
             if firstRename {
             XCTAssertTrue(self.app.staticTexts[expectedPath].firstMatch.waitForExistence(timeout: 15),
                           "renamed repo did not open as \(expectedPath)")
         }
-        rename("ui-smoke-2", "cmc/ui-smoke-2")
+        rename("ui-smoke-2", Self.scratchRepo + "-2")
-        rename("ui-smoke", "cmc/ui-smoke")
+        rename("ui-smoke", Self.scratchRepo)
         // --- pin / unpin round-trip on krz/gitbay-ios ---
         // Start the list fresh; the rename left the stack several deep.
         // The PGP key's UID email, below the keys on a List that does not
         // build rows it has not shown.
-        XCTAssertTrue(scrollTo(app.staticTexts["hello@cleberg.net"].firstMatch),
+        XCTAssertTrue(scrollTo(app.staticTexts[Self.smokePGPEmail].firstMatch),
                       "PGP key UID missing")
         // Activity mail flips off and back on; the value comes back from
         orgRow.tap()
         // Members render with roles.
-        XCTAssertTrue(app.staticTexts["cmc"].firstMatch
+        XCTAssertTrue(app.staticTexts[Self.smokeUser].firstMatch
             .waitForExistence(timeout: 15), "org members missing")
         // Create a team.
         // previous query, and clearing it from the harness is unreliable.
         app.terminate()
         app.launch()
-        openRepo("cmc/ui-smoke-edit")
+        openRepo(Self.editRepo)
         app.staticTexts["Files"].firstMatch.tap()
         let notes = app.staticTexts["notes.txt"].firstMatch
         XCTAssertTrue(notes.waitForExistence(timeout: 15), "notes.txt not in the tree")
         // --- a profile is a profile: description, links, orgs, graph, repos ---
         XCTAssertTrue(app.staticTexts
-            .containing(NSPredicate(format: "label CONTAINS 'Self-Hosting'")).firstMatch
+            .containing(NSPredicate(format: "label CONTAINS %@", Self.smokeProfileDescription)).firstMatch
             .waitForExistence(timeout: 20), "profile description missing")
         XCTAssertTrue(header("Organizations").exists,
                       "org memberships missing")
         snap("feed")
         selectTab("My Profile")
-        XCTAssertTrue(app.staticTexts
+        // Any signed-in account can edit its own profile, so this holds
-            .containing(NSPredicate(format: "label CONTAINS 'Self-Hosting'")).firstMatch
+        // for store screenshots taken as a real user too.
+        XCTAssertTrue(app.descendants(matching: .any)
+            .matching(identifier: "profile-edit-button").firstMatch
             .waitForExistence(timeout: 20), "profile did not load")
         snap("profile")
     }
         let orgRow = app.staticTexts[Self.smokeOrg].firstMatch
         XCTAssertTrue(orgRow.waitForExistence(timeout: 15), "org list missing")
         orgRow.tap()
-        XCTAssertTrue(app.staticTexts["cmc"].firstMatch.waitForExistence(timeout: 15),
+        XCTAssertTrue(app.staticTexts[Self.smokeUser].firstMatch.waitForExistence(timeout: 15),
                       "org members missing")
         // --- labels ---

gitbayUITests/smoke-account.sh added +65

@@ -0,0 +1,65 @@
	1	#!/bin/sh
	2	# Provision the ios-smoke account the live UI smoke suite runs as. Run
	3	# once, as an instance admin, where the gitbay CLI is signed in. It
	4	# creates the account with a fresh SSH key (~/.ssh/gitbay-ios-smoke),
	5	# makes it a krz admin, sets its profile description, registers a PGP
	6	# key, and pushes the ios-smoke/ui-smoke-edit fixture that
	7	# testBlameAndEditFlows edits. LiveSmokeUITests asserts on the same
	8	# values, so keep the two in step.
	9	set -eu
	10
	11	user=ios-smoke
	12	key=$HOME/.ssh/gitbay-$user
	13	description='Live UI smoke account for gitbay-ios'
	14	pgp_email="$user+pgp@gitbay.org"
	15
	16	[ -f "$key" ] \|\| ssh-keygen -q -t ed25519 -N '' -C "$user" -f "$key"
	17
	18	gitbay admin user create "$user" --email "$user@gitbay.org" --verified --key - < "$key.pub"
	19	gitbay org members add krz "$user" --role admin
	20
	21	# Everything below runs as the account. No multiplexing: the CLI's
	22	# control socket would otherwise answer as the admin.
	23	as_smoke() {
	24	ssh -i "$key" -o IdentitiesOnly=yes -o ControlPath=none git@gitbay.org "$@"
	25	}
	26
	27	as_smoke profile set --description "'$description'"
	28
	29	# The PGP key is a display fixture; its private half is discarded.
	30	gnupg=$(mktemp -d /tmp/pgp.XXXXXX)
	31	GNUPGHOME=$gnupg gpg --batch --quiet --quick-generate-key "$user <$pgp_email>" ed25519 sign never
	32	GNUPGHOME=$gnupg gpg --armor --export "$pgp_email" \| as_smoke pgp add
	33	GNUPGHOME=$gnupg gpgconf --kill all
	34	rm -rf "$gnupg"
	35
	36	as_smoke repo create "$user/ui-smoke-edit"
	37	work=$(mktemp -d)
	38	git -C "$work" init -q -b main
	39	cat > "$work/README.md" <<'EOF'
	40	# ui-smoke-edit
	41
	42	A fixture repository for the gitbay-ios live UI smoke suite. `notes.txt`
	43	is edited by `testBlameAndEditFlows` on every run.
	44
	45	Nothing in the app or the JSON API can seed a repository's first commit
	46	(that is a push), so the suite only checks that this repo exists and
	47	skips when it does not. `gitbayUITests/smoke-account.sh` in krz/gitbay-ios
	48	is what created it.
	49	EOF
	50	cat > "$work/notes.txt" <<'EOF'
	51	Scratch content for the live UI smoke suite.
	52
	53	testBlameAndEditFlows opens this file and saves an edit through the app,
	54	which is how the file-editing path is verified end to end. The text does
	55	not matter; the file existing does.
	56	EOF
	57	git -C "$work" add -A
	58	git -C "$work" -c user.name="$user" -c user.email="$user@gitbay.org" -c commit.gpgsign=false \
	59	commit -q -m 'fixture repo for the live smoke suite'
	60	GIT_SSH_COMMAND="ssh -i $key -o IdentitiesOnly=yes -o ControlPath=none" \
	61	git -C "$work" push -q "ssh://git@gitbay.org/$user/ui-smoke-edit.git" main
	62	rm -rf "$work"
	63
	64	echo "Mint the suite's token with:"
	65	echo " ssh -i $key -o IdentitiesOnly=yes -o ControlPath=none git@gitbay.org token create --name ui-smoke --scope full --ttl 30d"

Commit 4e67adb664

Commit `4e67adb664`