github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

No code changes, only style change to unwrap a lot of superfluous line breaks on chained calls.

Browse source
This commit is contained in:
LeeDr 2015-10-29 12:31:25 -05:00 • committed by Joe Fleming
parent 8f06870f74
commit 47054f9199
4 changed files with 155 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

325
test/functional/testSettings.js
View file

@ -34,50 +34,40 @@ define(function (require) {
beforeEach: function () {
// start each test with an empty kibana index
return scenarioManager
.unload('emptyKibana')
return scenarioManager.unload('emptyKibana')
.then(function () {
return common
.sleep(1000);
return common.sleep(1000);
})
.then(function () {
return scenarioManager
.load('emptyKibana');
return scenarioManager.load('emptyKibana');
})
.then(function () {
return common
.sleep(2000);
return common.sleep(2000);
})
// and load a minimal set of makelogs data
.then(function loadIfEmptyMakelogs() {
return scenarioManager
.load('emptyKibana');
return scenarioManager.loadIfEmpty('makelogs');
})
.then(function () {
return common.tryForTime(25000, function () {
return remote
.get(
url.format(_.assign(config.kibana, {
pathname: ''
})))
.then(function () {
return common
.sleep(2000);
})
.then(function () {
return remote
.getCurrentUrl()
.then(function (currentUrl) {
expect(currentUrl).to.contain('settings');
});
});
return remote.get(url.format(_.assign(config.kibana, {
pathname: ''
})))
.then(function () {
return common.sleep(2000);
})
.then(function () {
return remote.getCurrentUrl()
.then(function (currentUrl) {
expect(currentUrl).to.contain('settings');
});
});
});
});
},
teardown: function () {
return scenarioManager
.unload('logstash');
teardown: function unloadMakelogs() {
return scenarioManager.unload('makelogs');
},
/*
@ -86,26 +76,20 @@ define(function (require) {
'testSettingsInitialState': function () {
var testSubName = 'testSettingsInitialState';
return settingsPage
.getTimeBasedEventsCheckbox()
.isSelected()
return settingsPage.getTimeBasedEventsCheckbox().isSelected()
.then(function (selected) {
expect(selected).to.be.ok();
})
.then(function () {
return settingsPage
.getNameIsPatternCheckbox()
.isSelected()
return settingsPage.getNameIsPatternCheckbox().isSelected()
.then(function (nameIsPatternSelected) {
expect(nameIsPatternSelected).to.not.be.ok();
});
})
.then(function () {
return settingsPage
.getIndexPatternField()
return settingsPage.getIndexPatternField()
.then(function (patternField) {
return patternField
.getProperty('value')
return patternField.getProperty('value')
.then(function (pattern) {
common.log('patternField value = ' + pattern);
expect(pattern).to.be('logstash-*');
@ -113,8 +97,7 @@ define(function (require) {
});
})
.then(function () {
return settingsPage.getTimeFieldNameField()
.isSelected()
return settingsPage.getTimeFieldNameField().isSelected()
.then(function (timeFieldIsSelected) {
common.log('timeField isSelected = ' + timeFieldIsSelected);
expect(timeFieldIsSelected).to.not.be.ok();
@ -122,8 +105,7 @@ define(function (require) {
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
},
@ -133,9 +115,7 @@ define(function (require) {
'testCreateButtonDisabledUntilTimeFieldSelected': function () {
var testSubName = 'testCreateButtonDisabledUntilTimeFieldSelected';
return settingsPage
.getCreateButton()
.isEnabled()
return settingsPage.getCreateButton().isEnabled()
.then(function (enabled) {
expect(enabled).to.not.be.ok();
})
@ -145,16 +125,13 @@ define(function (require) {
.selectTimeFieldOption('@timestamp');
})
.then(function () {
return settingsPage
.getCreateButton()
.isEnabled()
return settingsPage.getCreateButton().isEnabled()
.then(function (enabled) {
expect(enabled).to.be.ok();
});
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
},
@ -165,8 +142,7 @@ define(function (require) {
'testSettingsCheckboxHide': function () {
var testSubName = 'testSettingsCheckboxHide';
return settingsPage
.getTimeBasedEventsCheckbox()
return settingsPage.getTimeBasedEventsCheckbox()
.then(function (selected) {
// uncheck the 'time-based events' checkbox
return selected.click();
@ -191,40 +167,32 @@ define(function (require) {
var testSubName = 'testCreateRemoveIndexPattern';
// select a time field and then Create button
return settingsPage
.selectTimeFieldOption('@timestamp')
return settingsPage.selectTimeFieldOption('@timestamp')
.then(function () {
return settingsPage
.getCreateButton()
.click();
return settingsPage.getCreateButton().click();
})
.then(function () {
return settingsPage
.getIndexPageHeading()
return settingsPage.getIndexPageHeading()
.then(function (getIndexPageHeading) {
common.log(getIndexPageHeading.getVisibleText());
})
.then(function () {
// delete the index pattern
return common.tryForTime(3000, function () {
return settingsPage
.clickDeletePattern();
return settingsPage.clickDeletePattern();
});
})
.then(function () {
return common.tryForTime(3000, function () {
return remote
.getAlertText();
return remote.getAlertText();
});
})
.then(function () {
return remote
.acceptAlert();
return remote.acceptAlert();
})
// getting the current URL which shows 'logstash-*' pattern
.then(function () {
return remote
.getCurrentUrl()
return remote.getCurrentUrl()
.then(function (currentUrl) {
common.log('currentUrl = ' + currentUrl);
});
@ -239,48 +207,39 @@ define(function (require) {
})
// getting the current URL which no longer includes 'logstash-*'
.then(function () {
return remote
.getCurrentUrl()
return remote.getCurrentUrl()
.then(function (currentUrl) {
common.log('currentUrl = ' + currentUrl);
});
});
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
},
'testIndexPatternResultsHeader': function () {
var testSubName = 'testIndexPatternResultsHeader';
return settingsPage
.selectTimeFieldOption('@timestamp')
return settingsPage.selectTimeFieldOption('@timestamp')
.then(function () {
return settingsPage
.getCreateButton()
.click();
return settingsPage.getCreateButton().click();
})
.then(function () {
return settingsPage
.getIndexPageHeading()
return settingsPage.getIndexPageHeading()
.then(function (getIndexPageHeading) {
return getIndexPageHeading
.getVisibleText()
return getIndexPageHeading.getVisibleText()
.then(function (pageText) {
expect(pageText).to.be('logstash-*');
});
});
})
.then(function () {
return settingsPage
.getTableHeader()
return settingsPage.getTableHeader()
.then(function (header) {
common.log('header.length = ' + header.length); // 6 name type format analyzed indexed controls
expect(header.length).to.be(6);
return header[0]
.getVisibleText()
return header[0].getVisibleText()
.then(function (text) {
common.log('header[0] = ' + text); // name
expect(text).to.be('name');
@ -288,8 +247,7 @@ define(function (require) {
});
})
.then(function (header) {
return header[1]
.getVisibleText()
return header[1].getVisibleText()
.then(function (text) {
common.log('header[1] = ' + text);
expect(text).to.be('type');
@ -297,8 +255,7 @@ define(function (require) {
});
})
.then(function (header) {
return header[2]
.getVisibleText()
return header[2].getVisibleText()
.then(function (text) {
common.log('header[2] = ' + text);
expect(text).to.be('format');
@ -306,8 +263,7 @@ define(function (require) {
});
})
.then(function (header) {
return header[3]
.getVisibleText()
return header[3].getVisibleText()
.then(function (text) {
common.log('header[3] = ' + text);
expect(text).to.be('analyzed');
@ -315,8 +271,7 @@ define(function (require) {
});
})
.then(function (header) {
return header[4]
.getVisibleText()
return header[4].getVisibleText()
.then(function (text) {
common.log('header[4] = ' + text);
expect(text).to.be('indexed');
@ -324,8 +279,7 @@ define(function (require) {
});
})
.then(function (header) {
return header[5]
.getVisibleText()
return header[5].getVisibleText()
.then(function (text) {
common.log('header[5] = ' + text);
expect(text).to.be('controls');
@ -335,32 +289,27 @@ define(function (require) {
.then(function () {
return common.tryForTime(3000, function () {
// delete the index pattern -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X
return settingsPage
.clickDeletePattern();
return settingsPage.clickDeletePattern();
});
})
.then(function () {
return common.tryForTime(3000, function () {
return remote
.getAlertText();
return remote.getAlertText();
});
})
.then(function () {
return remote
.getAlertText()
return remote.getAlertText()
.then(function (alertText) {
common.log('alertText = ' + alertText);
expect(alertText).to.be(expectedAlertText);
});
})
.then(function () {
return remote
.acceptAlert();
return remote.acceptAlert();
});
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
},
@ -368,20 +317,15 @@ define(function (require) {
'testIndexPatternResultsSort': function () {
var testSubName = 'testIndexPatternResultsSort';
return settingsPage
.selectTimeFieldOption('@timestamp')
return settingsPage.selectTimeFieldOption('@timestamp')
.then(function () {
return settingsPage
.getCreateButton()
.click();
return settingsPage.getCreateButton().click();
})
// check the page header to make sure we see logstash-*
.then(function () {
return settingsPage
.getIndexPageHeading()
return settingsPage.getIndexPageHeading()
.then(function (getIndexPageHeading) {
return getIndexPageHeading
.getVisibleText()
return getIndexPageHeading.getVisibleText()
.then(function (pageText) {
expect(pageText).to.be('logstash-*');
// return
@ -390,16 +334,13 @@ define(function (require) {
})
// Sort by Name
.then(function sortByName() {
return settingsPage
.sortBy('name');
return settingsPage.sortBy('name');
})
// check name sort
.then(function sortAgain() {
return settingsPage
.getTableRow(0, 0)
return settingsPage.getTableRow(0, 0)
.then(function (row) {
return row
.getVisibleText()
return row.getVisibleText()
.then(function (rowText) {
//common.log('After name-sort first row first column = ' + rowText);
expect(rowText).to.be('@message');
@ -408,16 +349,13 @@ define(function (require) {
})
// Sort by Name again
.then(function sortByName2() {
return settingsPage
.sortBy('name');
return settingsPage.sortBy('name');
})
// check name sort
.then(function sortAgain2() {
return settingsPage
.getTableRow(0, 0)
return settingsPage.getTableRow(0, 0)
.then(function (row) {
return row
.getVisibleText()
return row.getVisibleText()
.then(function (rowText) {
//common.log('After name-sort first row first column = ' + rowText);
expect(rowText).to.be('xss.raw');
@ -426,16 +364,13 @@ define(function (require) {
})
// Sort by type
.then(function sortByType() {
return settingsPage
.sortBy('type');
return settingsPage.sortBy('type');
})
// check type sort
.then(function checksort() {
return settingsPage
.getTableRow(0, 1)
return settingsPage.getTableRow(0, 1)
.then(function (row) {
return row
.getVisibleText()
return row.getVisibleText()
.then(function (rowText) {
//common.log('After type-sort first row first column = ' + rowText);
expect(rowText).to.be('_source');
@ -444,16 +379,13 @@ define(function (require) {
})
// Sort by type again
.then(function sortByType2() {
return settingsPage
.sortBy('type');
return settingsPage.sortBy('type');
})
// check type sort
.then(function checksort2() {
return settingsPage
.getTableRow(0, 1)
return settingsPage.getTableRow(0, 1)
.then(function (row) {
return row
.getVisibleText()
return row.getVisibleText()
.then(function (rowText) {
common.log('After type-sort first row first column = ' + rowText);
expect(rowText).to.be('string');
@ -462,13 +394,11 @@ define(function (require) {
})
// Sort by type again (this time it "unsorts it")
.then(function sortByType2() {
return settingsPage
.sortBy('type');
return settingsPage.sortBy('type');
})
// check pagination
.then(function getFieldsTabCount() {
return settingsPage
.getFieldsTabCount()
return settingsPage.getFieldsTabCount()
.then(function (tabCount) {
common.log('fields item count = ' + tabCount);
expect(tabCount).to.be('85');
@ -476,8 +406,7 @@ define(function (require) {
})
// verify the page size is 25
.then(function checkPageSize() {
return settingsPage
.getPageSize()
return settingsPage.getPageSize()
.then(function (pageSize) {
expect(pageSize).to.be('25');
});
@ -485,8 +414,7 @@ define(function (require) {
// we know with 25 fields per page and 85 fields there should be 4 pages.
// the first page should have 25 items on it.
.then(function getPageFieldCount() {
return settingsPage
.getPageFieldCount()
return settingsPage.getPageFieldCount()
.then(function (pageCount) {
common.log('Page 1 count = ' + pageCount.length);
expect(pageCount.length).to.be(25);
@ -494,12 +422,10 @@ define(function (require) {
})
//page 2 should also have 25 items
.then(function goPage2() {
return settingsPage
.goToPage(2);
return settingsPage.goToPage(2);
})
.then(function getPageFieldCount() {
return settingsPage
.getPageFieldCount()
return settingsPage.getPageFieldCount()
.then(function (pageCount) {
common.log('Page 2 count = ' + pageCount.length);
expect(pageCount.length).to.be(25);
@ -507,12 +433,10 @@ define(function (require) {
})
//page 3 should also have 25 items
.then(function goPage3() {
return settingsPage
.goToPage(3);
return settingsPage.goToPage(3);
})
.then(function getPageFieldCount() {
return settingsPage
.getPageFieldCount()
return settingsPage.getPageFieldCount()
.then(function (pageCount) {
common.log('Page 3 count = ' + pageCount.length);
expect(pageCount.length).to.be(25);
@ -520,12 +444,10 @@ define(function (require) {
})
//page 4 should also have 10 items
.then(function goPage4() {
return settingsPage
.goToPage(4);
return settingsPage.goToPage(4);
})
.then(function getPageFieldCount() {
return settingsPage
.getPageFieldCount()
return settingsPage.getPageFieldCount()
.then(function (pageCount) {
common.log('Page 4 count = ' + pageCount.length);
expect(pageCount.length).to.be(10);
@ -534,31 +456,26 @@ define(function (require) {
.then(function () {
return common.tryForTime(3000, function () {
// delete the index pattern -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X
return settingsPage
.clickDeletePattern();
return settingsPage.clickDeletePattern();
});
})
.then(function () {
return common.tryForTime(3000, function () {
return remote
.getAlertText();
return remote.getAlertText();
});
})
.then(function () {
return remote
.getAlertText()
return remote.getAlertText()
.then(function (alertText) {
common.log('alertText = ' + alertText);
expect(alertText).to.be(expectedAlertText);
});
})
.then(function () {
return remote
.acceptAlert();
return remote.acceptAlert();
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
},
@ -566,20 +483,15 @@ define(function (require) {
'testIndexPatternPopularity': function () {
var testSubName = 'testIndexPatternPopularity';
return settingsPage
.selectTimeFieldOption('@timestamp')
return settingsPage.selectTimeFieldOption('@timestamp')
.then(function () {
return settingsPage
.getCreateButton()
.click();
return settingsPage.getCreateButton().click();
})
// check the page header to make sure we see logstash-*
.then(function () {
return settingsPage
.getIndexPageHeading()
return settingsPage.getIndexPageHeading()
.then(function (getIndexPageHeading) {
return getIndexPageHeading
.getVisibleText()
return getIndexPageHeading.getVisibleText()
.then(function (pageText) {
expect(pageText).to.be('logstash-*');
// return
@ -587,21 +499,17 @@ define(function (require) {
});
})
.then(function () {
return settingsPage
.setPageSize('All');
return settingsPage.setPageSize('All');
})
// increase Popularity
.then(function openControlsByName() {
return settingsPage
.openControlsByName('geo.coordinates');
return settingsPage.openControlsByName('geo.coordinates');
})
.then(function increasePopularity() {
return settingsPage
.increasePopularity();
return settingsPage.increasePopularity();
})
.then(function getPopularity() {
return settingsPage
.getPopularity()
return settingsPage.getPopularity()
.then(function (popularity) {
common.log('popularity = ' + popularity);
expect(popularity).to.be('1');
@ -609,50 +517,41 @@ define(function (require) {
})
// Cancel saving the popularity change
.then(function controlChangeCancel() {
return settingsPage
.controlChangeCancel();
return settingsPage.controlChangeCancel();
})
// set the page size to All again, https://github.com/elastic/kibana/issues/5030
.then(function () {
return settingsPage
.setPageSize('All');
return settingsPage.setPageSize('All');
})
.then(function openControlsByName() {
return settingsPage
.openControlsByName('geo.coordinates');
return settingsPage.openControlsByName('geo.coordinates');
})
// check that its 0 (previous increase was cancelled)
.then(function getPopularity() {
return settingsPage
.getPopularity()
return settingsPage.getPopularity()
.then(function (popularity) {
common.log('popularity = ' + popularity);
expect(popularity).to.be('0');
});
})
.then(function increasePopularity() {
return settingsPage
.increasePopularity();
return settingsPage.increasePopularity();
})
// Saving the popularity change
.then(function controlChangeSave() {
return settingsPage
.controlChangeSave();
return settingsPage.controlChangeSave();
})
// set the page size to All again, https://github.com/elastic/kibana/issues/5030
.then(function () {
return settingsPage
.setPageSize('All');
return settingsPage.setPageSize('All');
})
// open it again to see that it saved
.then(function openControlsByName() {
return settingsPage
.openControlsByName('geo.coordinates');
return settingsPage.openControlsByName('geo.coordinates');
})
// check that its 0 (previous increase was cancelled)
.then(function getPopularity() {
return settingsPage
.getPopularity()
return settingsPage.getPopularity()
.then(function (popularity) {
common.log('popularity = ' + popularity);
expect(popularity).to.be('1');
@ -660,38 +559,32 @@ define(function (require) {
})
// Cancel saving the popularity change (we didn't make a change in this case, just checking the value)
.then(function controlChangeCancel() {
return settingsPage
.controlChangeCancel();
return settingsPage.controlChangeCancel();
})
// should this test go to discover page and verify the Popular field?
.then(function () {
return common.tryForTime(3000, function () {
// delete the index pattern -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X
return settingsPage
.clickDeletePattern();
// delete the index pattern
return settingsPage.clickDeletePattern();
});
})
.then(function () {
return common.tryForTime(3000, function () {
return remote
.getAlertText();
return remote.getAlertText();
});
})
.then(function () {
return remote
.getAlertText()
return remote.getAlertText()
.then(function (alertText) {
common.log('alertText = ' + alertText);
expect(alertText).to.be(expectedAlertText);
});
})
.then(function () {
return remote
.acceptAlert();
return remote.acceptAlert();
})
.catch(function screenshotError(reason) {
return common
.screenshotError(testSubName, reason);
return common.screenshotError(testSubName, reason);
});
}

3
test/support/pages/Common.js
View file

@ -67,8 +67,7 @@ define(function (require) {
var now = Date.now();
var filename = './screenshot-' + testSubName + '-ERROR-' + now + '.png';
self.log('Test Failed, taking screenshot "' + filename + '"');
return self.remote
.takeScreenshot()
return self.remote.takeScreenshot()
.then(function writeScreenshot(data) {
fs.writeFileSync(filename, data);
throw new Error(reason);

14
test/support/pages/HeaderPage.js
View file

@ -2,8 +2,6 @@
define(function (require) {
var Common = require('./Common');
var url = require('intern/dojo/node!url');
var expect = require('intern/dojo/node!expect.js');
var common;
@ -23,8 +21,7 @@ define(function (require) {
clickDiscover: function clickDiscover() {
common.log('Click Discover tab');
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('a[href*=\'discover\']')
.then(function (tab) {
return tab.click();
@ -35,8 +32,7 @@ define(function (require) {
var self = this.remote;
common.log('Click Visualize tab');
return common.tryForTime(5000, function () {
return self
.setFindTimeout(defaultTimeout)
return self.setFindTimeout(defaultTimeout)
.findByCssSelector('a[href*=\'visualize\']')
.then(function (tab) {
return tab.click();
@ -46,8 +42,7 @@ define(function (require) {
clickDashboard: function clickDashboard() {
common.log('Click Dashboard tab');
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('a[href*=\'dashboard\']')
.then(function (tab) {
return tab.click();
@ -56,8 +51,7 @@ define(function (require) {
clickSettings: function clickSettings() {
common.log('Click Settings tab');
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('a[href*=\'settings\']')
.then(function (tab) {
return tab.click();

113
test/support/pages/SettingsPage.js
View file

@ -18,107 +18,87 @@ define(function (require) {
constructor: SettingsPage,
getTimeBasedEventsCheckbox: function getTimeBasedEventsCheckbox() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('input[ng-model="index.isTimeBased"]');
},
getNameIsPatternCheckbox: function getNameIsPatternCheckbox() {
return this.remote
.setFindTimeout(defaultTimeout / 2) // fail faster since we're sometimes checking that it doesn't exist
// fail faster since we're sometimes checking that it doesn't exist
return this.remote.setFindTimeout(defaultTimeout / 2)
.findByCssSelector('input[ng-model="index.nameIsPattern"]');
},
getIndexPatternField: function getIndexPatternField() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('[ng-model="index.name"]');
},
getTimeFieldNameField: function getTimeFieldNameField() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('select[ng-model="index.timeField"]');
},
selectTimeFieldOption: function selectTimeFieldOption(selection) {
var self = this;
return this
.getTimeFieldNameField().click()
return this.getTimeFieldNameField().click()
.then(function () {
return self
.getTimeFieldNameField().click();
return self.getTimeFieldNameField().click();
})
.then(function () {
return self
.getTimeFieldOption(selection);
return self.getTimeFieldOption(selection);
});
},
getTimeFieldOption: function getTimeFieldOption(selection) {
return this.remote
.setFindTimeout(defaultTimeout * 2)
.findByCssSelector('option[label="' + selection + '"]')
.click();
return this.remote.setFindTimeout(defaultTimeout * 2)
.findByCssSelector('option[label="' + selection + '"]').click();
},
getCreateButton: function getCreateButton() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('.btn');
},
clickCreateButton: function clickCreateButton() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('.btn').click();
},
clickDefaultIndexButton: function clickDefaultIndexButton() {
return this.remote
.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-warning.ng-scope')
.click();
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-warning.ng-scope').click();
},
clickDeletePattern: function clickDeletePattern() {
return this.remote
.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-danger.ng-scope')
.click();
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-danger.ng-scope').click();
},
getIndexPageHeading: function getIndexPageHeading() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('h1.title.ng-binding.ng-isolate-scope');
},
getConfigureHeader: function getConfigureHeader() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('h1');
},
getTableHeader: function getTableHeader() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findAllByCssSelector('table.table.table-condensed thead tr th');
},
sortBy: function sortBy(columnName) {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findAllByCssSelector('table.table.table-condensed thead tr th span')
.then(function (chartTypes) {
function getChartType(chart) {
return chart
.getVisibleText()
return chart.getVisibleText()
.then(function (chartString) {
if (chartString === columnName) {
return chart
.click();
return chart.click();
}
});
}
@ -128,8 +108,7 @@ define(function (require) {
},
getTableRow: function getTableRow(rowNumber, colNumber) {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
// passing in zero-based index, but adding 1 for css 1-based indexes
.findByCssSelector('div.agg-table-paginated table.table.table-condensed tbody tr:nth-child(' +
(rowNumber + 1) + ') td.ng-scope:nth-child(' +
@ -138,13 +117,11 @@ define(function (require) {
},
getFieldsTabCount: function getFieldsTabCount() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
// passing in zero-based index, but adding 1 for css 1-based indexes
.findByCssSelector('li.kbn-settings-tab.ng-scope.active a.ng-binding small.ng-binding')
.then(function (tabData) {
return tabData
.getVisibleText()
return tabData.getVisibleText()
.then(function (theText) {
// the value has () around it, remove them
return theText.replace(/\((.*)\)/, '$1');
@ -154,19 +131,16 @@ define(function (require) {
getPageSize: function getPageSize() {
var selectedItemLabel = '';
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findAllByCssSelector('select.ng-pristine.ng-valid.ng-untouched option')
.then(function (chartTypes) {
function getChartType(chart) {
var thisChart = chart;
return chart
.isSelected()
return chart.isSelected()
.then(function (isSelected) {
if (isSelected === true) {
return thisChart
.getProperty('label')
return thisChart.getProperty('label')
.then(function (theLabel) {
selectedItemLabel = theLabel;
});
@ -182,14 +156,12 @@ define(function (require) {
},
getPageFieldCount: function getPageFieldCount() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findAllByCssSelector('div.agg-table-paginated table.table.table-condensed tbody tr td.ng-scope:nth-child(1) span.ng-binding');
},
goToPage: function goToPage(pageNum) {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('ul.pagination-other-pages-list.pagination-sm.ng-scope li.ng-scope:nth-child(' +
(pageNum + 1) + ') a.ng-binding'
)
@ -199,8 +171,7 @@ define(function (require) {
},
openControlsRow: function openControlsRow(row) {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('table.table.table-condensed tbody tr:nth-child(' +
(row + 1) + ') td.ng-scope div.actions a.btn.btn-xs.btn-default i.fa.fa-pencil'
)
@ -210,8 +181,7 @@ define(function (require) {
},
openControlsByName: function openControlsByName(name) {
return this.remote
.setFindTimeout(defaultTimeout * 2)
return this.remote.setFindTimeout(defaultTimeout * 2)
.findByCssSelector('div.actions a.btn.btn-xs.btn-default[href$="/' + name + '"]')
.then(function (button) {
return button.click();
@ -219,8 +189,7 @@ define(function (require) {
},
increasePopularity: function increasePopularity() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-default[aria-label="Plus"]')
.then(function (button) {
return button.click();
@ -228,18 +197,15 @@ define(function (require) {
},
getPopularity: function getPopularity() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('input.form-control.ng-pristine.ng-valid.ng-untouched.ng-valid-number')
.then(function (input) {
return input
.getProperty('value');
return input.getProperty('value');
});
},
controlChangeCancel: function controlChangeCancel() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-primary[aria-label="Cancel"]')
.then(function (button) {
return button.click();
@ -247,8 +213,7 @@ define(function (require) {
},
controlChangeSave: function controlChangeSave() {
return this.remote
.setFindTimeout(defaultTimeout)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('button.btn.btn-success.ng-binding[aria-label="Update Field"]')
.then(function (button) {
return button.click();
@ -263,6 +228,10 @@ define(function (require) {
return button.click();
});
}
<<<<<<< HEAD
=======
>>>>>>> 24da64f... No code changes, only style change to unwrap a lot of superfluous line breaks on chained calls.
};
return SettingsPage;