diff options
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/login/login.html | 2 | ||||
| -rw-r--r-- | webclient/test/README | 8 | ||||
| -rw-r--r-- | webclient/test/protractor.conf.js | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/webclient/login/login.html b/webclient/login/login.html index 6297ec4d42..6b321f8fc5 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -23,7 +23,7 @@ <br/> <input id="password" size="32" type="password" ng-model="account.password" placeholder="Password"/> <br/><br/> - <button ng-click="login()" ng-disabled="!account.user_id || !account.password || !account.homeserver">Login</button> + <button id="login" ng-click="login()" ng-disabled="!account.user_id || !account.password || !account.homeserver">Login</button> <br/><br/> </div> diff --git a/webclient/test/README b/webclient/test/README index 088181afc0..c13010e614 100644 --- a/webclient/test/README +++ b/webclient/test/README @@ -16,8 +16,12 @@ on. If you do, edit the config to point to that url): webdriver-manager start Create a file "environment-protractor.js" in this directory and type: - var seleniumAddress = 'http://localhost:4444/wd/hub'; - + module.exports = { + seleniumAddress: 'http://localhost:4444/wd/hub', + loginUrl: "http://localhost:8008/_matrix/client/#/login", + username: "YOUR_TEST_USERNAME", + password: "YOUR_TEST_PASSWORD" + } Running e2e tests: protractor protractor.conf.js diff --git a/webclient/test/protractor.conf.js b/webclient/test/protractor.conf.js index 66f4df5407..720096b390 100644 --- a/webclient/test/protractor.conf.js +++ b/webclient/test/protractor.conf.js @@ -1,6 +1,11 @@ var env = require("./environment-protractor.js"); - exports.config = { - seleniumAddress: env.seleniumAddress, - specs: ['e2e/*.spec.js'] + seleniumAddress: env.seleniumAddress, + specs: ['e2e/*.spec.js'], + onPrepare: function() { + browser.driver.get(env.loginUrl); + browser.driver.findElement(by.id("user_id")).sendKeys(env.username); + browser.driver.findElement(by.id("password")).sendKeys(env.password); + browser.driver.findElement(by.id("login")).click(); + } } |