Skip to content

Commit

Permalink
Start developing for nc13
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
ChristophWurst committed Oct 9, 2017
1 parent 3ea03be commit f35140b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

env:
global:
- CORE_BRANCH=stable12
- CORE_BRANCH=master
- PHP_COVERAGE=FALSE
- SAUCE=FALSE
matrix:
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/settings.png</screenshot>
<dependencies>
<php min-version="5.6" max-version="7.1" />
<nextcloud min-version="12" max-version="12" />
<nextcloud min-version="13" max-version="13" />
</dependencies>
<two-factor-providers>
<provider>OCA\TwoFactorTOTP\Provider\TotpProvider</provider>
Expand Down
10 changes: 2 additions & 8 deletions tests/Acceptance/TOTPAcceptanceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f35140b

Please sign in to comment.