diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx
index 18890c578473de0a2189468613774fd3ca21357a..9d4d9c638ed2b7a6abab872b15e0fca04659b3d8 100644
--- a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx
@@ -39,6 +39,7 @@ const datasource = mockDatasource['7__table'];
 
 const SAVE_ENDPOINT = 'glob:*/api/v1/dataset/7';
 const SAVE_PAYLOAD = { new: 'data' };
+const SAVE_DATASOURCE_ENDPOINT = 'glob:*/datasource/save/';
 
 const mockedProps = {
   datasource,
@@ -94,6 +95,7 @@ describe('DatasourceModal', () => {
 
   it('saves on confirm', async () => {
     const callsP = fetchMock.post(SAVE_ENDPOINT, SAVE_PAYLOAD);
+    fetchMock.post(SAVE_DATASOURCE_ENDPOINT, {});
     act(() => {
       wrapper
         .find('button[data-test="datasource-modal-save"]')
diff --git a/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopover_spec.jsx b/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopover_spec.jsx
index 59bc07c76528176a521b528e023768ed1e3aabaf..3930de3231c73d5e418c569f222288907021996b 100644
--- a/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopover_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopover_spec.jsx
@@ -51,7 +51,7 @@ function setup(overrides) {
   const onClose = sinon.spy();
   const props = {
     adhocMetric: sumValueAdhocMetric,
-    savedMetric: {},
+    savedMetric: { metric_name: 'foo', expression: 'COUNT(*)' },
     savedMetrics: [],
     onChange,
     onClose,
diff --git a/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx
index 4d675c738bd91004bf4c735d0ee013033042a6d3..f9822bf338e47be7d3aad2a2f648385cf1442623 100644
--- a/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx
@@ -34,7 +34,7 @@ const defaultProps = {
 describe('ColorPickerControl', () => {
   let wrapper;
   let inst;
-  beforeEach(() => {
+  beforeAll(() => {
     getCategoricalSchemeRegistry()
       .registerValue(
         'test',
diff --git a/superset-frontend/spec/javascripts/explore/components/DatasourcePanel_spec.jsx b/superset-frontend/spec/javascripts/explore/components/DatasourcePanel_spec.jsx
index 1bfd67ad2682e8565ab3c412bc75af05bf256d34..784e10581448b17798e702f37fb17e65596c6ba8 100644
--- a/superset-frontend/spec/javascripts/explore/components/DatasourcePanel_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/DatasourcePanel_spec.jsx
@@ -45,7 +45,7 @@ describe('datasourcepanel', () => {
         datasource,
       },
     },
-    actions: null,
+    actions: {},
   };
   it('should render', () => {
     const { container } = render(
diff --git a/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
index 023b0796ff86e0d5531e5e7d8645a1a1140344aa..afa33d0d064728efff6b40b036aec5488ec55a2d 100644
--- a/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
@@ -44,8 +44,10 @@ const mockProps = {
   },
   timeout: 1000,
   chart: {
+    id: 0,
     queryResponse: {},
   },
+  chartHeight: '30px',
 };
 
 describe('ExploreChartHeader', () => {
diff --git a/superset-frontend/spec/javascripts/explore/components/MetricDefinitionOption_spec.jsx b/superset-frontend/spec/javascripts/explore/components/MetricDefinitionOption_spec.jsx
index d1a93df6655ae0d030cad058514776e94a4e0c87..7b950e8cf01ef714c0b1d4c69e39a2c2da2756ac 100644
--- a/superset-frontend/spec/javascripts/explore/components/MetricDefinitionOption_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/MetricDefinitionOption_spec.jsx
@@ -33,7 +33,9 @@ describe('MetricDefinitionOption', () => {
   }
 
   it('renders a MetricOption given a saved metric', () => {
-    const wrapper = setup({ option: { metric_name: 'a_saved_metric' } });
+    const wrapper = setup({
+      option: { metric_name: 'a_saved_metric', expression: 'COUNT(*)' },
+    });
     expect(wrapper.find(MetricOption)).toExist();
   });
 
diff --git a/superset-frontend/spec/javascripts/explore/components/MetricDefinitionValue_spec.jsx b/superset-frontend/spec/javascripts/explore/components/MetricDefinitionValue_spec.jsx
index f2e038e77db4e247394807e3be0f90984c7eabad..9c9a652d94faa2721f9ec3bb142c3842929fb75d 100644
--- a/superset-frontend/spec/javascripts/explore/components/MetricDefinitionValue_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/MetricDefinitionValue_spec.jsx
@@ -33,7 +33,11 @@ const sumValueAdhocMetric = new AdhocMetric({
 describe('MetricDefinitionValue', () => {
   it('renders a MetricOption given a saved metric', () => {
     const wrapper = shallow(
-      <MetricDefinitionValue option={{ metric_name: 'a_saved_metric' }} />,
+      <MetricDefinitionValue
+        onMetricEdit={() => {}}
+        option={{ metric_name: 'a_saved_metric', expression: 'COUNT(*)' }}
+        index={1}
+      />,
     );
     expect(wrapper.find('AdhocMetricOption')).toExist();
   });
@@ -43,6 +47,7 @@ describe('MetricDefinitionValue', () => {
       <MetricDefinitionValue
         onMetricEdit={() => {}}
         option={sumValueAdhocMetric}
+        index={1}
       />,
     );
     expect(wrapper.find(AdhocMetricOption)).toExist();
diff --git a/superset-frontend/spec/javascripts/sqllab/SqlEditor_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SqlEditor_spec.jsx
index d472030d332d41b67af7fe1090e522110a62511a..eca063c7f4db3aa6b1056e219090a68f62b1839d 100644
--- a/superset-frontend/spec/javascripts/sqllab/SqlEditor_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SqlEditor_spec.jsx
@@ -55,6 +55,7 @@ describe('SqlEditor', () => {
     dataPreviewQueries: [],
     defaultQueryLimit: 1000,
     maxRow: 100000,
+    displayLimit: 100,
   };
 
   const buildWrapper = (props = {}) =>