RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add test behavior VisitPageAndWaitUrlIs.

pull/330/head
Clement Michaud 2019-02-12 23:41:19 +01:00
parent c579355c5b
commit 595ee97182
13 changed files with 82 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/helpers/FullLogin.ts
View File

@ -1,12 +1,12 @@
import VisitPage from "./VisitPage";
import FillLoginPageAndClick from "./FillLoginPageAndClick"; import FillLoginPageAndClick from "./FillLoginPageAndClick";
import ValidateTotp from "./ValidateTotp"; import ValidateTotp from "./ValidateTotp";
import VerifyUrlIs from "./assertions/VerifyUrlIs"; import VerifyUrlIs from "./assertions/VerifyUrlIs";
import { WebDriver } from "selenium-webdriver"; import { WebDriver } from "selenium-webdriver";
import VisitPageAndWaitUrlIs from "./behaviors/VisitPageAndWaitUrlIs";
// Validate the two factors! // Validate the two factors!
export default async function(driver: WebDriver, user: string, secret: string, url: string) { export default async function(driver: WebDriver, user: string, secret: string, url: string) {
await VisitPage(driver, `https://login.example.com:8080/?rd=${url}`); await VisitPageAndWaitUrlIs(driver, `https://login.example.com:8080/?rd=${url}`);
await FillLoginPageAndClick(driver, user, 'password'); await FillLoginPageAndClick(driver, user, 'password');
await ValidateTotp(driver, secret); await ValidateTotp(driver, secret);
await VerifyUrlIs(driver, url); await VerifyUrlIs(driver, url);

4
test/helpers/LoginAs.ts
View File

@ -1,8 +1,8 @@
import VisitPage from "./VisitPage";
import FillLoginPageAndClick from './FillLoginPageAndClick'; import FillLoginPageAndClick from './FillLoginPageAndClick';
import { WebDriver } from "selenium-webdriver"; import { WebDriver } from "selenium-webdriver";
import VisitPageAndWaitUrlIs from "./behaviors/VisitPageAndWaitUrlIs";
export default async function(driver: WebDriver, user: string, password: string = "password") { export default async function(driver: WebDriver, user: string, password: string = "password") {
await VisitPage(driver, "https://login.example.com:8080/"); await VisitPageAndWaitUrlIs(driver, "https://login.example.com:8080/");
await FillLoginPageAndClick(driver, user, password); await FillLoginPageAndClick(driver, user, password);
} }

3
test/helpers/VisitPage.ts
View File

@ -1,6 +1,5 @@
import SeleniumWebdriver, { WebDriver } from "selenium-webdriver"; import SeleniumWebdriver, { WebDriver } from "selenium-webdriver";
export default async function(driver: WebDriver, url: string, timeout: number = 5000) { export default async function(driver: WebDriver, url: string, timeout: number = 5000) {
await driver.get(url) await driver.get(url);
await driver.wait(SeleniumWebdriver.until.urlIs(url), timeout);
} }

6
test/helpers/behaviors/LoginOneFactor.ts
View File

@ -1,9 +1,7 @@
import { WebDriver } from "selenium-webdriver"; import { WebDriver } from "selenium-webdriver";
import LoginAndRegisterTotp from "../LoginAndRegisterTotp";
import FullLogin from "../FullLogin";
import VisitPage from "../VisitPage";
import FillLoginPageAndClick from "../FillLoginPageAndClick"; import FillLoginPageAndClick from "../FillLoginPageAndClick";
import VerifyUrlIs from "../assertions/VerifyUrlIs"; import VerifyUrlIs from "../assertions/VerifyUrlIs";
import VisitPageAndWaitUrlIs from "./VisitPageAndWaitUrlIs";
export default async function( export default async function(
driver: WebDriver, driver: WebDriver,
@ -11,7 +9,7 @@ export default async function(
password: string, password: string,
targetUrl: string) { targetUrl: string) {
await VisitPage(driver, `https://login.example.com:8080/?rd=${targetUrl}`); await VisitPageAndWaitUrlIs(driver, `https://login.example.com:8080/?rd=${targetUrl}`);
await FillLoginPageAndClick(driver, username, password); await FillLoginPageAndClick(driver, username, password);
await VerifyUrlIs(driver, targetUrl); await VerifyUrlIs(driver, targetUrl);
}; };

8
test/helpers/behaviors/VisitPageAndWaitUrlIs.ts 100644
View File

@ -0,0 +1,8 @@
import { WebDriver } from "selenium-webdriver";
import VerifyUrlIs from "../assertions/VerifyUrlIs";
import VisitPage from "../VisitPage";
export default async function(driver: WebDriver, url: string, timeout: number = 5000) {
await VisitPage(driver, url);
await VerifyUrlIs(driver, url);
}

2
test/suites/complete/index.ts
View File

@ -3,6 +3,7 @@ import MongoConnectionRecovery from "./scenarii/MongoConnectionRecovery";
import EnforceInternalRedirectionsOnly from "./scenarii/EnforceInternalRedirectionsOnly"; import EnforceInternalRedirectionsOnly from "./scenarii/EnforceInternalRedirectionsOnly";
import AccessControl from "./scenarii/AccessControl"; import AccessControl from "./scenarii/AccessControl";
import CustomHeadersForwarded from "./scenarii/CustomHeadersForwarded"; import CustomHeadersForwarded from "./scenarii/CustomHeadersForwarded";
import SingleFactorAuthentication from "./scenarii/SingleFactorAuthentication";
AutheliaSuite('Complete configuration', __dirname + '/config.yml', function() { AutheliaSuite('Complete configuration', __dirname + '/config.yml', function() {
this.timeout(10000); this.timeout(10000);
@ -12,4 +13,5 @@ AutheliaSuite('Complete configuration', __dirname + '/config.yml', function() {
describe('Mongo broken connection recovery', MongoConnectionRecovery); describe('Mongo broken connection recovery', MongoConnectionRecovery);
describe('Enforce internal redirections only', EnforceInternalRedirectionsOnly); describe('Enforce internal redirections only', EnforceInternalRedirectionsOnly);
describe('Single factor authentication', SingleFactorAuthentication);
}); });

11
test/suites/complete/scenarii/AccessControl.ts
View File

@ -6,17 +6,18 @@ import FillLoginPageAndClick from "../../../helpers/FillLoginPageAndClick";
import ValidateTotp from "../../../helpers/ValidateTotp"; import ValidateTotp from "../../../helpers/ValidateTotp";
import VerifyUrlIs from "../../../helpers/assertions/VerifyUrlIs"; import VerifyUrlIs from "../../../helpers/assertions/VerifyUrlIs";
import Logout from "../../../helpers/Logout"; import Logout from "../../../helpers/Logout";
import VisitPageAndWaitUrlIs from "../../../helpers/behaviors/VisitPageAndWaitUrlIs";
async function ShouldHaveAccessTo(url: string) { async function ShouldHaveAccessTo(url: string) {
it('should have access to ' + url, async function() { it('should have access to ' + url, async function() {
await VisitPage(this.driver, url); await VisitPageAndWaitUrlIs(this.driver, url);
await VerifySecretObserved(this.driver); await VerifySecretObserved(this.driver);
}) })
} }
async function ShouldNotHaveAccessTo(url: string) { async function ShouldNotHaveAccessTo(url: string) {
it('should not have access to ' + url, async function() { it('should not have access to ' + url, async function() {
await this.driver.get(url); await VisitPage(this.driver, url);
await VerifyUrlIs(this.driver, 'https://login.example.com:8080/'); await VerifyUrlIs(this.driver, 'https://login.example.com:8080/');
}) })
} }
@ -34,7 +35,7 @@ export default function() {
before(async function() { before(async function() {
const secret = await LoginAndRegisterTotp(this.driver, "john", true); const secret = await LoginAndRegisterTotp(this.driver, "john", true);
await VisitPage(this.driver, 'https://login.example.com:8080/'); await VisitPageAndWaitUrlIs(this.driver, 'https://login.example.com:8080/');
await FillLoginPageAndClick(this.driver, 'john', 'password', false); await FillLoginPageAndClick(this.driver, 'john', 'password', false);
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
}) })
@ -61,7 +62,7 @@ export default function() {
before(async function() { before(async function() {
const secret = await LoginAndRegisterTotp(this.driver, "bob", true); const secret = await LoginAndRegisterTotp(this.driver, "bob", true);
await VisitPage(this.driver, 'https://login.example.com:8080/'); await VisitPageAndWaitUrlIs(this.driver, 'https://login.example.com:8080/');
await FillLoginPageAndClick(this.driver, 'bob', 'password', false); await FillLoginPageAndClick(this.driver, 'bob', 'password', false);
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
}) })
@ -88,7 +89,7 @@ export default function() {
before(async function() { before(async function() {
const secret = await LoginAndRegisterTotp(this.driver, "harry", true); const secret = await LoginAndRegisterTotp(this.driver, "harry", true);
await VisitPage(this.driver, 'https://login.example.com:8080/'); await VisitPageAndWaitUrlIs(this.driver, 'https://login.example.com:8080/');
await FillLoginPageAndClick(this.driver, 'harry', 'password', false); await FillLoginPageAndClick(this.driver, 'harry', 'password', false);
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
}) })

14
test/suites/complete/scenarii/EnforceInternalRedirectionsOnly.ts
View File

@ -1,11 +1,11 @@
import LoginAndRegisterTotp from "../../../helpers/LoginAndRegisterTotp"; import LoginAndRegisterTotp from "../../../helpers/LoginAndRegisterTotp";
import VisitPage from "../../../helpers/VisitPage";
import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick'; import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick';
import ValidateTotp from "../../../helpers/ValidateTotp"; import ValidateTotp from "../../../helpers/ValidateTotp";
import Logout from "../../../helpers/Logout"; import Logout from "../../../helpers/Logout";
import WaitRedirected from "../../../helpers/WaitRedirected"; import VerifyIsAlreadyAuthenticatedStage from "../../../helpers/assertions/VerifyIsAlreadyAuthenticatedStage";
import IsAlreadyAuthenticatedStage from "../../../helpers/assertions/VerifyIsAlreadyAuthenticatedStage";
import { StartDriver, StopDriver } from "../../../helpers/context/WithDriver"; import { StartDriver, StopDriver } from "../../../helpers/context/WithDriver";
import VisitPageAndWaitUrlIs from "../../../helpers/behaviors/VisitPageAndWaitUrlIs";
import VerifyUrlIs from "../../../helpers/assertions/VerifyUrlIs";
/* /*
* Authelia should not be vulnerable to open redirection. Otherwise it would aid an * Authelia should not be vulnerable to open redirection. Otherwise it would aid an
@ -31,19 +31,19 @@ export default function() {
function CannotRedirectTo(url: string) { function CannotRedirectTo(url: string) {
it(`should redirect to already authenticated page when requesting ${url}`, async function() { it(`should redirect to already authenticated page when requesting ${url}`, async function() {
await VisitPage(this.driver, `https://login.example.com:8080/?rd=${url}`); await VisitPageAndWaitUrlIs(this.driver, `https://login.example.com:8080/?rd=${url}`);
await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password'); await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password');
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
await IsAlreadyAuthenticatedStage(this.driver); await VerifyIsAlreadyAuthenticatedStage(this.driver);
}); });
} }
function CanRedirectTo(url: string) { function CanRedirectTo(url: string) {
it(`should redirect to ${url}`, async function() { it(`should redirect to ${url}`, async function() {
await VisitPage(this.driver, `https://login.example.com:8080/?rd=${url}`); await VisitPageAndWaitUrlIs(this.driver, `https://login.example.com:8080/?rd=${url}`);
await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password'); await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password');
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
await WaitRedirected(this.driver, url); await VerifyUrlIs(this.driver, url);
}); });
} }

34
test/suites/complete/scenarii/SingleFactorAuthentication.ts 100644
View File

@ -0,0 +1,34 @@
import Logout from "../../../helpers/Logout";
import { StartDriver, StopDriver } from "../../../helpers/context/WithDriver";
import LoginOneFactor from "../../../helpers/behaviors/LoginOneFactor";
import VerifySecretObserved from "../../../helpers/assertions/VerifySecretObserved";
import VisitPage from "../../../helpers/VisitPage";
import VerifyUrlIs from "../../../helpers/assertions/VerifyUrlIs";
import VerifyIsSecondFactorStage from "../../../helpers/assertions/VerifyIsSecondFactorStage";
export default function() {
beforeEach(async function() {
this.driver = await StartDriver();
});
afterEach(async function() {
await Logout(this.driver);
await StopDriver(this.driver);
});
it("should redirect user after first stage", async function() {
await LoginOneFactor(this.driver, "john", "password", "https://single_factor.example.com:8080/secret.html");
await VerifySecretObserved(this.driver);
});
it("should redirect to portal if not enough authorized", async function() {
await LoginOneFactor(this.driver, "john", "password", "https://single_factor.example.com:8080/secret.html");
await VisitPage(this.driver, "https://admin.example.com:8080/secret.html");
// the url should be the one from the portal.
await VerifyUrlIs(this.driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
// And the user should end up on the second factor page.
await VerifyIsSecondFactorStage(this.driver);
})
}

4
test/suites/minimal/scenarii/BadPassword.ts
View File

@ -1,7 +1,7 @@
import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick'; import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick';
import VisitPage from '../../../helpers/VisitPage';
import SeeNotification from '../../../helpers/SeeNotification'; import SeeNotification from '../../../helpers/SeeNotification';
import {AUTHENTICATION_FAILED} from '../../../../shared/UserMessages'; import {AUTHENTICATION_FAILED} from '../../../../shared/UserMessages';
import VisitPageAndWaitUrlIs from '../../../helpers/behaviors/VisitPageAndWaitUrlIs';
export default function() { export default function() {
/** /**
@ -11,7 +11,7 @@ export default function() {
describe('failed login as john in first factor', function() { describe('failed login as john in first factor', function() {
beforeEach(async function() { beforeEach(async function() {
this.timeout(10000); this.timeout(10000);
await VisitPage(this.driver, "https://login.example.com:8080/") await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/")
await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'bad_password'); await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'bad_password');
}); });

14
test/suites/minimal/scenarii/Inactivity.ts
View File

@ -1,9 +1,9 @@
import LoginAndRegisterTotp from "../../../helpers/LoginAndRegisterTotp"; import LoginAndRegisterTotp from "../../../helpers/LoginAndRegisterTotp";
import VisitPage from "../../../helpers/VisitPage";
import FillLoginPageWithUserAndPasswordAndClick from "../../../helpers/FillLoginPageAndClick"; import FillLoginPageWithUserAndPasswordAndClick from "../../../helpers/FillLoginPageAndClick";
import ValidateTotp from "../../../helpers/ValidateTotp"; import ValidateTotp from "../../../helpers/ValidateTotp";
import WaitRedirected from "../../../helpers/WaitRedirected"; import WaitRedirected from "../../../helpers/WaitRedirected";
import { WebDriver } from "selenium-webdriver"; import { WebDriver } from "selenium-webdriver";
import VisitPageAndWaitUrlIs from "../../../helpers/behaviors/VisitPageAndWaitUrlIs";
export default function(this: Mocha.ISuiteCallbackContext) { export default function(this: Mocha.ISuiteCallbackContext) {
this.timeout(20000); this.timeout(20000);
@ -14,11 +14,11 @@ export default function(this: Mocha.ISuiteCallbackContext) {
it("should disconnect user after inactivity period", async function() { it("should disconnect user after inactivity period", async function() {
const driver = this.driver as WebDriver; const driver = this.driver as WebDriver;
await VisitPage(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await VisitPageAndWaitUrlIs(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', false); await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', false);
await ValidateTotp(driver, this.secret); await ValidateTotp(driver, this.secret);
await WaitRedirected(driver, "https://admin.example.com:8080/secret.html"); await WaitRedirected(driver, "https://admin.example.com:8080/secret.html");
await VisitPage(driver, "https://home.example.com:8080/"); await VisitPageAndWaitUrlIs(driver, "https://home.example.com:8080/");
await driver.sleep(6000); await driver.sleep(6000);
await driver.get("https://admin.example.com:8080/secret.html"); await driver.get("https://admin.example.com:8080/secret.html");
await WaitRedirected(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await WaitRedirected(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
@ -26,11 +26,11 @@ export default function(this: Mocha.ISuiteCallbackContext) {
it('should disconnect user after cookie expiration', async function() { it('should disconnect user after cookie expiration', async function() {
const driver = this.driver as WebDriver; const driver = this.driver as WebDriver;
await VisitPage(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await VisitPageAndWaitUrlIs(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', false); await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', false);
await ValidateTotp(driver, this.secret); await ValidateTotp(driver, this.secret);
await WaitRedirected(driver, "https://admin.example.com:8080/secret.html"); await WaitRedirected(driver, "https://admin.example.com:8080/secret.html");
await VisitPage(driver, "https://home.example.com:8080/"); await VisitPageAndWaitUrlIs(driver, "https://home.example.com:8080/");
await driver.sleep(4000); await driver.sleep(4000);
await driver.get("https://admin.example.com:8080/secret.html"); await driver.get("https://admin.example.com:8080/secret.html");
@ -46,11 +46,11 @@ export default function(this: Mocha.ISuiteCallbackContext) {
describe('With remember me checkbox checked', function() { describe('With remember me checkbox checked', function() {
it("should keep user logged in after inactivity period", async function() { it("should keep user logged in after inactivity period", async function() {
const driver = this.driver as WebDriver; const driver = this.driver as WebDriver;
await VisitPage(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await VisitPageAndWaitUrlIs(driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', true); await FillLoginPageWithUserAndPasswordAndClick(driver, 'john', 'password', true);
await ValidateTotp(driver, this.secret); await ValidateTotp(driver, this.secret);
await WaitRedirected(driver, "https://admin.example.com:8080/secret.html"); await WaitRedirected(driver, "https://admin.example.com:8080/secret.html");
await VisitPage(driver, "https://home.example.com:8080/"); await VisitPageAndWaitUrlIs(driver, "https://home.example.com:8080/");
await driver.sleep(6000); await driver.sleep(6000);
await driver.get("https://admin.example.com:8080/secret.html"); await driver.get("https://admin.example.com:8080/secret.html");
await WaitRedirected(driver, "https://admin.example.com:8080/secret.html"); await WaitRedirected(driver, "https://admin.example.com:8080/secret.html");

12
test/suites/minimal/scenarii/ResetPassword.ts
View File

@ -1,6 +1,5 @@
import SeleniumWebDriver from 'selenium-webdriver'; import SeleniumWebDriver from 'selenium-webdriver';
import VisitPage from '../../../helpers/VisitPage';
import ClickOnLink from '../../../helpers/ClickOnLink'; import ClickOnLink from '../../../helpers/ClickOnLink';
import ClickOn from '../../../helpers/ClickOn'; import ClickOn from '../../../helpers/ClickOn';
import WaitRedirected from '../../../helpers/WaitRedirected'; import WaitRedirected from '../../../helpers/WaitRedirected';
@ -9,10 +8,11 @@ import {GetLinkFromEmail} from "../../../helpers/GetIdentityLink";
import FillLoginPageAndClick from "../../../helpers/FillLoginPageAndClick"; import FillLoginPageAndClick from "../../../helpers/FillLoginPageAndClick";
import IsSecondFactorStage from "../../../helpers/assertions/VerifyIsSecondFactorStage"; import IsSecondFactorStage from "../../../helpers/assertions/VerifyIsSecondFactorStage";
import SeeNotification from '../../../helpers/SeeNotification'; import SeeNotification from '../../../helpers/SeeNotification';
import VisitPageAndWaitUrlIs from '../../../helpers/behaviors/VisitPageAndWaitUrlIs';
export default function() { export default function() {
it("should reset password for john", async function() { it("should reset password for john", async function() {
await VisitPage(this.driver, "https://login.example.com:8080/"); await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/");
await ClickOnLink(this.driver, "Forgot password\?"); await ClickOnLink(this.driver, "Forgot password\?");
await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password"); await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password");
await FillField(this.driver, "username", "john"); await FillField(this.driver, "username", "john");
@ -21,7 +21,7 @@ export default function() {
await this.driver.sleep(500); // Simulate the time it takes to receive the e-mail. await this.driver.sleep(500); // Simulate the time it takes to receive the e-mail.
const link = await GetLinkFromEmail(); const link = await GetLinkFromEmail();
await VisitPage(this.driver, link); await VisitPageAndWaitUrlIs(this.driver, link);
await FillField(this.driver, "password1", "newpass"); await FillField(this.driver, "password1", "newpass");
await FillField(this.driver, "password2", "newpass"); await FillField(this.driver, "password2", "newpass");
await ClickOn(this.driver, SeleniumWebDriver.By.id('reset-button')); await ClickOn(this.driver, SeleniumWebDriver.By.id('reset-button'));
@ -33,7 +33,7 @@ export default function() {
}); });
it("should persuade reset password is initiated for unknown user", async function() { it("should persuade reset password is initiated for unknown user", async function() {
await VisitPage(this.driver, "https://login.example.com:8080/"); await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/");
await ClickOnLink(this.driver, "Forgot password\?"); await ClickOnLink(this.driver, "Forgot password\?");
await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password"); await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password");
await FillField(this.driver, "username", "unknown"); await FillField(this.driver, "username", "unknown");
@ -44,7 +44,7 @@ export default function() {
}); });
it("should notify passwords are different in reset form", async function() { it("should notify passwords are different in reset form", async function() {
await VisitPage(this.driver, "https://login.example.com:8080/"); await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/");
await ClickOnLink(this.driver, "Forgot password\?"); await ClickOnLink(this.driver, "Forgot password\?");
await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password"); await WaitRedirected(this.driver, "https://login.example.com:8080/forgot-password");
await FillField(this.driver, "username", "john"); await FillField(this.driver, "username", "john");
@ -53,7 +53,7 @@ export default function() {
await this.driver.sleep(500); // Simulate the time it takes to receive the e-mail. await this.driver.sleep(500); // Simulate the time it takes to receive the e-mail.
const link = await GetLinkFromEmail(); const link = await GetLinkFromEmail();
await VisitPage(this.driver, link); await VisitPageAndWaitUrlIs(this.driver, link);
await FillField(this.driver, "password1", "newpass"); await FillField(this.driver, "password1", "newpass");
await FillField(this.driver, "password2", "badpass"); await FillField(this.driver, "password2", "badpass");
await ClickOn(this.driver, SeleniumWebDriver.By.id('reset-button')); await ClickOn(this.driver, SeleniumWebDriver.By.id('reset-button'));

6
test/suites/minimal/scenarii/TOTPValidation.ts
View File

@ -1,11 +1,11 @@
import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick'; import FillLoginPageWithUserAndPasswordAndClick from '../../../helpers/FillLoginPageAndClick';
import WaitRedirected from '../../../helpers/WaitRedirected'; import WaitRedirected from '../../../helpers/WaitRedirected';
import VisitPage from '../../../helpers/VisitPage';
import ValidateTotp from '../../../helpers/ValidateTotp'; import ValidateTotp from '../../../helpers/ValidateTotp';
import VerifySecretObserved from "../../../helpers/assertions/VerifySecretObserved"; import VerifySecretObserved from "../../../helpers/assertions/VerifySecretObserved";
import LoginAndRegisterTotp from '../../../helpers/LoginAndRegisterTotp'; import LoginAndRegisterTotp from '../../../helpers/LoginAndRegisterTotp';
import SeeNotification from '../../../helpers/SeeNotification'; import SeeNotification from '../../../helpers/SeeNotification';
import { AUTHENTICATION_TOTP_FAILED } from '../../../../shared/UserMessages'; import { AUTHENTICATION_TOTP_FAILED } from '../../../../shared/UserMessages';
import VisitPageAndWaitUrlIs from '../../../helpers/behaviors/VisitPageAndWaitUrlIs';
export default function() { export default function() {
/** /**
@ -18,7 +18,7 @@ export default function() {
const secret = await LoginAndRegisterTotp(this.driver, "john", true); const secret = await LoginAndRegisterTotp(this.driver, "john", true);
if (!secret) throw new Error('No secret!'); if (!secret) throw new Error('No secret!');
await VisitPage(this.driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password'); await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password');
await ValidateTotp(this.driver, secret); await ValidateTotp(this.driver, secret);
await WaitRedirected(this.driver, "https://admin.example.com:8080/secret.html"); await WaitRedirected(this.driver, "https://admin.example.com:8080/secret.html");
@ -39,7 +39,7 @@ export default function() {
await LoginAndRegisterTotp(this.driver, "john", true); await LoginAndRegisterTotp(this.driver, "john", true);
const BAD_TOKEN = "125478"; const BAD_TOKEN = "125478";
await VisitPage(this.driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html"); await VisitPageAndWaitUrlIs(this.driver, "https://login.example.com:8080/?rd=https://admin.example.com:8080/secret.html");
await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password'); await FillLoginPageWithUserAndPasswordAndClick(this.driver, 'john', 'password');
await ValidateTotp(this.driver, BAD_TOKEN); await ValidateTotp(this.driver, BAD_TOKEN);
}); });