Skip to content

#1467 Load fesUrl only when needed#1480

Merged
sosnovsky merged 16 commits intomasterfrom
bugfix/issue-1467-lazy-fes-url
Apr 10, 2022
Merged

#1467 Load fesUrl only when needed#1480
sosnovsky merged 16 commits intomasterfrom
bugfix/issue-1467-lazy-fes-url

Conversation

@sosnovsky
Copy link
Collaborator

@sosnovsky sosnovsky commented Apr 6, 2022

This PR makes fesUrl a lazy property.

close #1467


Tests (delete all except exactly one):

  • Tests added or updated

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

  • addresses the issue it closes (if any)
  • code is readable and understandable
  • is accompanied with tests, or tests are not needed
  • is free of vulnerabilities
  • is documented clearly and usefully, or doesn't need documentation

tomholub
tomholub previously approved these changes Apr 6, 2022
@sosnovsky sosnovsky marked this pull request as ready for review April 6, 2022 18:38
@sosnovsky sosnovsky enabled auto-merge (squash) April 6, 2022 18:38
tomholub
tomholub previously approved these changes Apr 7, 2022
# Conflicts:
#	FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved
tomholub
tomholub previously approved these changes Apr 9, 2022
@tomholub
Copy link
Collaborator

tomholub commented Apr 9, 2022

@sosnovsky I tried to resolve a conflict but broke it. Or maybe it's flakiness of tests.

[iPhone 13 iOS 15.4 #0-5] Running: iPhone 13 on iOS 15.4 executing /Users/semaphore/git/flowcrypt-ios/appium/FlowCrypt.app 39:24
[iPhone 13 iOS 15.4 #0-5] Session ID: fd5e992a-34df-4e8c-9f4d-b1109a0233ef 39:24
[iPhone 13 iOS 15.4 #0-5] 39:24
[iPhone 13 iOS 15.4 #0-5] » /tests/specs/live/composeEmail/RecipientListLabelCheck.spec.ts 39:24
[iPhone 13 iOS 15.4 #0-5] COMPOSE EMAIL: 39:24
[iPhone 13 iOS 15.4 #0-5]    ✖ should toggle recipient list label and show correct email addresses 39:24
  39:24
[iPhone 13 iOS 15.4 #0-5] 1 failing (1m 22.9s) 39:24
[iPhone 13 iOS 15.4 #0-5] 39:24
[iPhone 13 iOS 15.4 #0-5] 1) COMPOSE EMAIL:  should toggle recipient list label and show correct email addresses 39:24
[iPhone 13 iOS 15.4 #0-5] Error: Can't call setValue on element with selector "~aid-recipients-text-field-cc" because element wasn't found 39:24
[iPhone 13 iOS 15.4 #0-5] Error: Can't call setValue on element with selector "~aid-recipients-text-field-cc" because element wasn't found 39:24
[iPhone 13 iOS 15.4 #0-5]     at async NewMessageScreen.setAddRecipient (/Users/semaphore/git/flowcrypt-ios/appium/tests/screenobjects/new-message.screen.ts:134:7) 39:24
[iPhone 13 iOS 15.4 #0-5]     at async NewMessageScreen.composeEmail (/Users/semaphore/git/flowcrypt-ios/appium/tests/screenobjects/new-message.screen.ts:159:7) 39:24
[iPhone 13 iOS 15.4 #0-5]     at async UserContext.<anonymous> (/Users/semaphore/git/flowcrypt-ios/appium/tests/specs/live/composeEmail/RecipientListLabelCheck.spec.ts:33:5)

could consider a wait for that element before setting the value

@sosnovsky
Copy link
Collaborator Author

@sosnovsky I tried to resolve a conflict but broke it. Or maybe it's flakiness of tests.

Works well for me locally after merging latest changes from master

@tomholub why you decided to rollback to swiftpm v1? Did you get any issues after update?

@tomholub
Copy link
Collaborator

tomholub commented Apr 9, 2022

@sosnovsky I tried to resolve a conflict but broke it. Or maybe it's flakiness of tests.

Works well for me locally after merging latest changes from master

@tomholub why you decided to rollback to swiftpm v1? Did you get any issues after update?

I have hand-crafted the v2 file after a merge conflict (from master to this branch), and suspected I maybe have messed it up in the process. So I wanted to go with the safer choice of using the one I know works from master.

Otherwise have nothing against v2, it's probably good to upgrade, just wasn't sure the v2 file was correct after my interventions.

@sosnovsky
Copy link
Collaborator Author

Got it, Package.resolved is automatically reformatted when you open project in Xcode 13.3.
I'll push update in a few minutes

tomholub
tomholub previously approved these changes Apr 9, 2022
# Conflicts:
#	.semaphore/semaphore.yml
@sosnovsky sosnovsky merged commit b14c964 into master Apr 10, 2022
@sosnovsky sosnovsky deleted the bugfix/issue-1467-lazy-fes-url branch April 10, 2022 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fesUrl as a lazy property

2 participants