maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switched back to using reload in testSettings setup. Removed unneded quotes on test names.

Browse source
This commit is contained in:
LeeDr 2015-10-29 14:15:07 -05:00 committed by Joe Fleming
parent 47054f9199
commit cb7ae4f738
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/status.js
View file

@ -6,7 +6,7 @@ define(function (require) {
registerSuite(function () { registerSuite(function () {
return { return {
'status': function () { status: function () {
return this.remote return this.remote
.get(getUrl(config.kibana, 'status')) .get(getUrl(config.kibana, 'status'))
.setFindTimeout(60000) .setFindTimeout(60000)

25
test/functional/testSettings.js
View file

@ -34,16 +34,7 @@ define(function (require) {
beforeEach: function () { beforeEach: function () {
// start each test with an empty kibana index // start each test with an empty kibana index
return scenarioManager.unload('emptyKibana') return scenarioManager.reload('emptyKibana')
.then(function () {
return common.sleep(1000);
})
.then(function () {
return scenarioManager.load('emptyKibana');
})
.then(function () {
return common.sleep(2000);
})
// and load a minimal set of makelogs data // and load a minimal set of makelogs data
.then(function loadIfEmptyMakelogs() { .then(function loadIfEmptyMakelogs() {
return scenarioManager.loadIfEmpty('makelogs'); return scenarioManager.loadIfEmpty('makelogs');
@ -73,7 +64,7 @@ define(function (require) {
/* /*
** Test the default state of checboxes and the 2 text input fields ** Test the default state of checboxes and the 2 text input fields
*/ */
'testSettingsInitialState': function () { testSettingsInitialState: function () {
var testSubName = 'testSettingsInitialState'; var testSubName = 'testSettingsInitialState';
return settingsPage.getTimeBasedEventsCheckbox().isSelected() return settingsPage.getTimeBasedEventsCheckbox().isSelected()
@ -112,7 +103,7 @@ define(function (require) {
/* /*
** Ensure Create button is disabled until you select a time field ** Ensure Create button is disabled until you select a time field
*/ */
'testCreateButtonDisabledUntilTimeFieldSelected': function () { testCreateButtonDisabledUntilTimeFieldSelected: function () {
var testSubName = 'testCreateButtonDisabledUntilTimeFieldSelected'; var testSubName = 'testCreateButtonDisabledUntilTimeFieldSelected';
return settingsPage.getCreateButton().isEnabled() return settingsPage.getCreateButton().isEnabled()
@ -139,7 +130,7 @@ define(function (require) {
/* /*
** Test that unchecking the Time-based Events checkbox hides the Name is pattern checkbox ** Test that unchecking the Time-based Events checkbox hides the Name is pattern checkbox
*/ */
'testSettingsCheckboxHide': function () { testSettingsCheckboxHide: function () {
var testSubName = 'testSettingsCheckboxHide'; var testSubName = 'testSettingsCheckboxHide';
return settingsPage.getTimeBasedEventsCheckbox() return settingsPage.getTimeBasedEventsCheckbox()
@ -163,7 +154,7 @@ define(function (require) {
}, },
// Index pattern field list // Index pattern field list
'testCreateRemoveIndexPattern': function () { testCreateRemoveIndexPattern: function () {
var testSubName = 'testCreateRemoveIndexPattern'; var testSubName = 'testCreateRemoveIndexPattern';
// select a time field and then Create button // select a time field and then Create button
@ -218,7 +209,7 @@ define(function (require) {
}); });
}, },
'testIndexPatternResultsHeader': function () { testIndexPatternResultsHeader: function () {
var testSubName = 'testIndexPatternResultsHeader'; var testSubName = 'testIndexPatternResultsHeader';
return settingsPage.selectTimeFieldOption('@timestamp') return settingsPage.selectTimeFieldOption('@timestamp')
@ -314,7 +305,7 @@ define(function (require) {
}, },
'testIndexPatternResultsSort': function () { testIndexPatternResultsSort: function () {
var testSubName = 'testIndexPatternResultsSort'; var testSubName = 'testIndexPatternResultsSort';
return settingsPage.selectTimeFieldOption('@timestamp') return settingsPage.selectTimeFieldOption('@timestamp')
@ -480,7 +471,7 @@ define(function (require) {
}, },
'testIndexPatternPopularity': function () { testIndexPatternPopularity: function () {
var testSubName = 'testIndexPatternPopularity'; var testSubName = 'testIndexPatternPopularity';
return settingsPage.selectTimeFieldOption('@timestamp') return settingsPage.selectTimeFieldOption('@timestamp')