Merge remote-tracking branch 'upstream/master' into ft/deeplinking-link-component

2017-12-12 09:18:12 -06:00
parent f819612144 2f32056fae
commit 0e883d4a7a
11 changed files with 89 additions and 52 deletions
--- a/test/components/models.js
+++ b/test/components/models.js
@@ -43,7 +43,7 @@ describe("<Models/>", function(){

    // Then should render tabs
    expect(wrapper.find("ModelCollapse").length).toEqual(1)
-    expect(wrapper.find("ModelComponent").length).toBeGreaterThan(0)
+    expect(wrapper.find("ModelWrapper").length).toBeGreaterThan(0)
    wrapper.find("ModelComponent").forEach((modelWrapper) => {
      expect(modelWrapper.props().expandDepth).toBe(0)
    })