Browse Source

Fix local e2e tests

develop
Chocobozzz 4 days ago
parent
commit
a41b944398
No known key found for this signature in database GPG Key ID: 583A612D890159BE
4 changed files with 8 additions and 6 deletions
  1. +1
    -1
      client/e2e/src/po/admin-config.po.ts
  2. +3
    -3
      client/e2e/src/po/my-account.po.ts
  3. +1
    -1
      client/e2e/src/po/signup.po.ts
  4. +3
    -1
      client/e2e/src/suites-local/signup.e2e-spec.ts

+ 1
- 1
client/e2e/src/po/admin-config.po.ts View File

@@ -17,7 +17,7 @@ export class AdminConfigPage {
const elem = $('#instanceDefaultNSFWPolicy')

await elem.waitForDisplayed()
await elem.scrollIntoView(false) // Avoid issues with fixed header on firefox
await elem.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
await elem.waitForClickable()

return elem.selectByAttribute('value', newValue)


+ 3
- 3
client/e2e/src/po/my-account.po.ts View File

@@ -24,7 +24,7 @@ export class MyAccountPage {
const nsfw = $('#nsfwPolicy')

await nsfw.waitForDisplayed()
await nsfw.scrollIntoView(false) // Avoid issues with fixed header on firefox
await nsfw.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
await nsfw.waitForClickable()

await nsfw.selectByAttribute('value', newValue)
@@ -36,7 +36,7 @@ export class MyAccountPage {
const p2p = await getCheckbox('p2pEnabled')

await p2p.waitForClickable()
await p2p.scrollIntoView(false) // Avoid issues with fixed header on firefox
await p2p.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header

await p2p.click()

@@ -47,7 +47,7 @@ export class MyAccountPage {
const submit = $('my-user-video-settings input[type=submit]')

await submit.waitForClickable()
await submit.scrollIntoView(false)
await submit.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
await submit.click()
}



+ 1
- 1
client/e2e/src/po/signup.po.ts View File

@@ -50,7 +50,7 @@ export class SignupPage {
await $('#password').setValue(options.password || 'password')

// Fix weird bug on firefox that "cannot scroll into view" when using just `setValue`
await $('#email').scrollIntoView(false)
await $('#email').scrollIntoView({ block: 'center' })
await $('#email').waitForClickable()
await $('#email').setValue(options.email || `${options.username}@example.com`)
}


+ 3
- 1
client/e2e/src/suites-local/signup.e2e-spec.ts View File

@@ -243,8 +243,10 @@ describe('Signup', () => {
let emailPort: number

before(async () => {
const key = browser.options.baseUrl + '-emailPort'
// FIXME: typings are wrong, get returns a promise
emailPort = await (browser.sharedStore.get(browser.options.baseUrl + '-emailPort') as unknown as Promise<number>)
// FIXME: use * because the key is not properly escaped by the shared store when using get(key)
emailPort = (await (browser.sharedStore.get('*') as unknown as Promise<number>))[key]

await MockSMTPServer.Instance.collectEmails(emailPort, emails)
})


Loading…
Cancel
Save