Fix integration tests

frontend/src/metabase/lib/dataset.js

 /* @flow */
 
 import _ from "underscore";
-import * as Q from "metabase/lib/query/query";
 
 import type {
   Value,
@@ -126,7 +125,7 @@ export function getExistingFields(card: Card, cols: Column[]): ConcreteField[] {
   const query = card.dataset_query.query;
   if (query.fields && query.fields > 0) {
     return query.fields;
-  } else if (Q.isBareRows(query)) {
+  } else if (!query.aggregation && !query.breakout) {
     // $FlowFixMe:
     return cols.map(col => fieldRefForColumn(col)).filter(id => id != null);
   } else {

frontend/test/query_builder/components/VisualizationSettings.integ.spec.js

@@ -16,7 +16,6 @@ import {
 
 import { FETCH_TABLE_METADATA } from "metabase/redux/metadata";
 
-import CheckBox from "metabase/components/CheckBox";
 import RunButton from "metabase/query_builder/components/RunButton";
 
 import VisualizationSettings from "metabase/query_builder/components/VisualizationSettings";
@@ -65,17 +64,14 @@ describe("QueryBuilder", () => {
       const doneButton = settingsModal.find(".Button--primary");
       expect(doneButton.length).toBe(1);
 
-      const fieldsToIncludeCheckboxes = settingsModal.find(CheckBox);
-      expect(fieldsToIncludeCheckboxes.length).toBe(7);
+      const fieldsToIncludeRemoveButtons = settingsModal.find(".Icon-close");
+      expect(fieldsToIncludeRemoveButtons.length).toBe(6);
 
       click(
-        fieldsToIncludeCheckboxes.filterWhere(
-          checkbox =>
-            checkbox
-              .parent()
-              .find("span")
-              .text() === "Created At",
-        ),
+        settingsModal
+          .find("ColumnItem")
+          .findWhere(x => x.text() === "Created At")
+          .find(".Icon-close"),
       );
 
       expect(table.find('div[children="Created At"]').length).toBe(0);