Merge branch 'master' of github.com:elastic/kibana into refactor/calc…

…-auto-interval
elastic · Oct 27, 2018 · b4f8a79 · b4f8a79
2 parents 3ea56af + 59206ec
commit b4f8a79
Show file tree

Hide file tree

Showing 19 changed files with 2,243 additions and 2,034 deletions.
diff --git a/packages/kbn-es/src/install/snapshot.js b/packages/kbn-es/src/install/snapshot.js
@@ -89,7 +89,7 @@ function downloadFile(url, dest, log) {
         }
 
         if (!res.ok) {
-          return reject(new Error(res.statusText));
+          return reject(new Error(`Unable to download elasticsearch snapshot: ${res.statusText}`));
         }
 
         const stream = fs.createWriteStream(downloadPath);

diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js
@@ -427,7 +427,7 @@ export default class BaseOptimizer {
       Stats.presetToOptions('minimal')
     ));
 
-    throw Boom.internal(
+    return Boom.internal(
       `Optimizations failure.\n${details.split('\n').join('\n    ')}\n`,
       stats.toJson(Stats.presetToOptions('detailed'))
     );

diff --git a/...lugins/apm/public/components/app/ErrorGroupDetails/DetailView/__test__/DetailView.test.js b/...lugins/apm/public/components/app/ErrorGroupDetails/DetailView/__test__/DetailView.test.js
@@ -7,43 +7,36 @@
 import React from 'react';
 import DetailView from '../index';
 import props from './props.json';
+import { shallow } from 'enzyme';
 
-import {
-  mountWithRouterAndStore,
-  mockMoment,
-  toJson
-} from '../../../../../utils/testHelpers';
+import { mockMoment } from '../../../../../utils/testHelpers';
 
 describe('DetailView', () => {
-  let storeState;
   beforeEach(() => {
     // Avoid timezone issues
     mockMoment();
-
-    storeState = {
-      location: { search: '' }
-    };
   });
 
   it('should render empty state', () => {
-    const wrapper = mountWithRouterAndStore(
-      <DetailView errorGroup={[]} urlParams={props.urlParams} location={{}} />,
-      storeState
+    const wrapper = shallow(
+      <DetailView
+        errorGroup={[]}
+        urlParams={props.urlParams}
+        location={{ state: '' }}
+      />
     );
-
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   it('should render with data', () => {
-    const wrapper = mountWithRouterAndStore(
+    const wrapper = shallow(
       <DetailView
         errorGroup={props.errorGroup}
         urlParams={props.urlParams}
-        location={{}}
-      />,
-      storeState
+        location={{ state: '' }}
+      />
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });