Skip to content

Commit cc7cbd2

Browse files
committed
Fix broken model info display test
1 parent 22ad8c6 commit cc7cbd2

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

cesium_app/tests/frontend/test_build_model.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,19 @@ def test_cannot_build_model_unlabeled_data(driver, project, featureset):
9696
"//div[contains(.,'Cannot build model for unlabeled feature set.')]")
9797

9898

99-
def test_model_info_display(driver, project, featureset, model):
99+
@pytest.mark.parametrize('featureset__name, model_type',
100+
[('class', 'RandomForestClassifier (fast)')])
101+
def test_model_info_display(driver, project, featureset, model_type):
100102
driver.refresh()
101-
proj_select = Select(driver.find_element_by_css_selector('[name=project]'))
102-
proj_select.select_by_value(str(project.id))
103-
driver.find_element_by_id('react-tabs-6').click()
103+
_build_model(project.id, model_type, driver)
104104

105-
driver.wait_for_xpath("//td[contains(text(),'{}')]".format(model.name)).click()
105+
driver.wait_for_xpath("//td[contains(text(), 'Completed')]").click()
106106
time.sleep(0.5)
107107
assert driver.wait_for_xpath("//th[contains(text(),'Model Type')]")\
108108
.is_displayed()
109-
assert driver.wait_for_xpath("//th[contains(text(),'Hyper"
110-
"parameters')]").is_displayed()
111-
assert driver.wait_for_xpath("//th[contains(text(),'Training "
112-
"Data Score')]").is_displayed()
109+
assert driver.wait_for_xpath("//th[contains(text(),"
110+
"'Hyperparameters')]").is_displayed()
111+
assert driver.wait_for_xpath("//th[contains(text(),"
112+
"'train_score')]").is_displayed()
113+
assert driver.wait_for_xpath("//canvas[@class='chartjs-render-monitor']")\
114+
.is_displayed()

static/js/components/FeatureImportances.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { HorizontalBar } from 'react-chartjs-2';
34

45

56
const FeatureImportancesBarchart = props => {
67
const sorted_features = Object.keys(props.data).sort(
7-
(a, b) => props.data[b] - props.data[a]).slice(0, 15);
8+
(a, b) => props.data[b] - props.data[a]
9+
).slice(0, 15);
810
const values = sorted_features.map(feature => props.data[feature]);
911
const data = {
1012
labels: sorted_features,
@@ -33,5 +35,8 @@ const FeatureImportancesBarchart = props => {
3335
</div>
3436
);
3537
};
38+
FeatureImportancesBarchart.propTypes = {
39+
data: PropTypes.array.isRequired
40+
};
3641

3742
export default FeatureImportancesBarchart;

static/js/components/Models.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ const ModelInfo = props => (
207207
<td key={`td_${metric}`}>
208208
{
209209
metric == 'feature_importances' ?
210-
<FeatureImportances data={props.model.metrics[metric]} /> :
211-
props.model.metrics[metric].toFixed(3)
210+
<FeatureImportances data={props.model.metrics[metric]} /> :
211+
props.model.metrics[metric].toFixed(3)
212212
}
213213
</td>))
214214
}

0 commit comments

Comments
 (0)