Skip to content

Commit

Permalink
Merge pull request #6705 from spalger/fix/functionalTestsLoadingField…
Browse files Browse the repository at this point in the history
…Data

Fix functional tests for visualize
  • Loading branch information
epixa committed Mar 30, 2016
2 parents 6fa397e + 6f27183 commit d28cb32
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/_line_chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ define(function (require) {
})
.then(function selectField() {
common.debug('Field = extension');
return visualizePage.selectField('extension');
return visualizePage.selectField('extension.raw');
})
.then(function setInterval() {
common.debug('switch from Rows to Columns');
Expand Down
15 changes: 0 additions & 15 deletions test/support/pages/settings_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,6 @@ define(function (require) {
return common.findTestSubject('settingsNav advanced').click();
},

setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) {
var self = this;
return common.findTestSubject('advancedSetting&' + propertyName + ' editButton')
.click()
.then(function setAdvancedSettingsClickPropertyValue(selectList) {
return self.remote
.findDisplayedByCssSelector('option[label="' + propertyValue + '"]')
.click();
})
.then(function setAdvancedSettingsClickSaveButton() {
return common.findTestSubject('advancedSetting&' + propertyName + ' saveButton')
.click();
});
},

getAdvancedSettings: function getAdvancedSettings(propertyName) {
common.debug('in setAdvancedSettings');
return common.findTestSubject('advancedSetting&' + propertyName + ' currentValue')
Expand Down

0 comments on commit d28cb32

Please sign in to comment.