Merge pull request #199 from veg/develop

2.6.0 - BUSTED tree/alignment evidence ratio widget

.gitignore

@@ -41,3 +41,6 @@ web/docs/public
 jsx-compiled
 dist
 public
+
+tags*
+*yalc*

__tests__/graphs.test.jsx

@@ -11,10 +11,14 @@ import {
   DatamonkeyScatterplot,
   DatamonkeyGraphMenu
 } from "../src/jsx/components/graphs.jsx";
+import Enzyme from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
 import { mount } from "enzyme";
 
 var _ = require("underscore");
 
+Enzyme.configure({ adapter: new Adapter() });
+
 describe("DatamonkeySeries", () => {
   var x = _.range(10);
   var y = [_.range(10)];
@@ -60,7 +64,6 @@ describe("DatamonkeyScatterplot", () => {
   });
 });
 
-
 describe("GraphMenu", () => {
   var x_options = ["Site"];
   var y_options = ["alpha", "beta"];
@@ -94,11 +97,5 @@ describe("GraphMenu", () => {
 
     let menu = no_ylabel_component.toJSON();
     expect(menu).toMatchSnapshot();
-
-
-
   });
-
-
-
 });

__tests__/tables.test.jsx

@@ -7,6 +7,8 @@ import ReactDOM from "react-dom";
 import TestUtils from "react-dom/test-utils";
 import renderer from "react-test-renderer";
 import { DatamonkeyTable } from "../src/jsx/components/tables.jsx";
+import Enzyme from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
 import { mount } from "enzyme";
 
 var _ = require("underscore");
@@ -15,6 +17,8 @@ import $ from "jquery";
 global.$ = global.jQuery = $;
 require("jquery-ui-bundle");
 
+Enzyme.configure({ adapter: new Adapter() });
+
 describe("DatamonkeyTable", () => {
   var mle_headers = [
     { value: "Site", sortable: true, abbr: "Site Position" },
@@ -78,7 +82,12 @@ describe("DatamonkeyTable", () => {
     var elem = table.find("th").at(1);
     elem.simulate("click");
     elem.simulate("click");
-    expect(table.find("td").at(1).text()).toBe("119.000");
+    expect(
+      table
+        .find("td")
+        .at(1)
+        .text()
+    ).toBe("119.000");
   });
 
   it("sort columns that are already sorted (tests bug fix)", () => {
@@ -94,6 +103,11 @@ describe("DatamonkeyTable", () => {
     var elem = table.find("th").at(0);
     elem.simulate("click");
     elem.simulate("click");
-    expect(table.find("td").at(0).text()).toBe("10");
+    expect(
+      table
+        .find("td")
+        .at(0)
+        .text()
+    ).toBe("10");
   });
 });