diff --git a/.travis.yml b/.travis.yml index 035340f8..c1d5963d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ services: env: global: - - CORE_BRANCH=stable12 + - CORE_BRANCH=master - PHP_COVERAGE=FALSE - SAUCE=FALSE matrix: diff --git a/appinfo/info.xml b/appinfo/info.xml index 8e619811..622e020f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -18,7 +18,7 @@ https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/settings.png - + OCA\TwoFactorTOTP\Provider\TotpProvider diff --git a/tests/Acceptance/TOTPAcceptanceTest.php b/tests/Acceptance/TOTPAcceptanceTest.php index 4305f29b..bcbe4e10 100644 --- a/tests/Acceptance/TOTPAcceptanceTest.php +++ b/tests/Acceptance/TOTPAcceptanceTest.php @@ -83,14 +83,8 @@ public function testEnableTOTP() { $this->webDriver->findElement(WebDriverBy::id('password'))->sendKeys('admin'); $this->webDriver->findElement(WebDriverBy::cssSelector('form[name=login] input[type=submit]'))->click(); - // Go to personal settings - $this->webDriver->wait(20, 200)->until(WebDriverExpectedCondition::elementToBeClickable(WebDriverBy::id('expandDisplayName'))); - $this->webDriver->findElement(WebDriverBy::id('expandDisplayName'))->click(); - $this->webDriver->findElement(WebDriverBy::linkText('Personal'))->click(); - - // Go to TOTP settings - $this->webDriver->wait(20, 200)->until(WebDriverExpectedCondition::elementToBeClickable(WebDriverBy::linkText('TOTP second-factor auth'))); - $this->webDriver->findElement(WebDriverBy::linkText('TOTP second-factor auth'))->click(); + // Go to personal settings and TOTP settings + $this->webDriver->get('http://localhost:8080/index.php/settings/user/security'); // Enable TOTP // Wait for state being loaded from the server