Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions test/support/pages/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ define(function (require) {
var parse = require('intern/dojo/node!url').parse;
var format = require('intern/dojo/node!url').format;
var path = require('intern/dojo/node!path');
var ShieldPage = require('../../support/pages/shield_page');

var shieldPage;

function injectTimestampQuery(func, url) {
var formatted = modifyQueryString(url, function (parsed) {
Expand Down Expand Up @@ -43,6 +46,7 @@ define(function (require) {
remote.get.wrapper = injectTimestampQuery;
this.remote.getCurrentUrl = _.wrap(this.remote.getCurrentUrl, removeTimestampQuery);
}
shieldPage = new ShieldPage(this.remote);
}


Expand Down Expand Up @@ -90,6 +94,20 @@ define(function (require) {
.then(function () {
return self.remote.getCurrentUrl();
})
.then(function (currentUrl) {
var loginPage = new RegExp('login').test(currentUrl);
if (loginPage) {
self.debug('Found loginPage = ' + loginPage + ', username = '
+ config.servers.kibana.shield.username);
return shieldPage.login(config.servers.kibana.shield.username,
config.servers.kibana.shield.password)
.then(function () {
return self.remote.getCurrentUrl();
});
} else {
return currentUrl;
}
})
.then(function (currentUrl) {
currentUrl = currentUrl.replace(/\/\/\w+:\w+@/, '//');
var navSuccessful = new RegExp(appUrl).test(currentUrl);
Expand Down
35 changes: 35 additions & 0 deletions test/support/pages/shield_page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// in test/support/pages/shield_page.js
define(function (require) {
var config = require('intern').config;
var defaultTimeout = config.timeouts.default;

// the page object is created as a constructor
// so we can provide the remote Command object
// at runtime
function ShieldPage(remote) {
this.remote = remote;
}

ShieldPage.prototype = {
constructor: ShieldPage,

login: function login(user, pwd) {
var self = this.remote;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self is a misnomer here, it should probably just be remote

return self.setFindTimeout(5000)
.findById('username')
.type(user)
.then(function () {
return self.findById('password')
.type(pwd);
})
.then(function () {
return self.findByCssSelector('.btn')
.click();
});
}


};

return ShieldPage;
});