Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 33 deletions

diff --git a/spec/frontend/error_tracking/store/list/actions_spec.js b/spec/frontend/error_tracking/store/list/actions_spec.js
new file mode 100644
index 00000000000..dba1b31b9f3
--- /dev/null
+++ b/spec/frontend/error_tracking/store/list/actions_spec.js
@@ -0,0 +1,29 @@
+import axios from '~/lib/utils/axios_utils';
+import MockAdapter from 'axios-mock-adapter';
+import * as actions from '~/error_tracking/store/list/actions';
+import * as types from '~/error_tracking/store/list/mutation_types';
+
+describe('error tracking actions', () => {
+  let mock;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  describe('startPolling', () => {
+    it('commits SET_LOADING', () => {
+      mock.onGet().reply(200);
+      const endpoint = '/errors';
+      const commit = jest.fn();
+      const state = {};
+
+      actions.startPolling({ commit, state }, endpoint);
+
+      expect(commit).toHaveBeenCalledWith(types.SET_LOADING, true);
+    });
+  });
+});
diff --git a/spec/frontend/error_tracking/store/list/getters_spec.js b/spec/frontend/error_tracking/store/list/getters_spec.js
deleted file mode 100644
index 3cd7fa37d44..00000000000
--- a/spec/frontend/error_tracking/store/list/getters_spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as getters from '~/error_tracking/store/list/getters';
-
-describe('Error Tracking getters', () => {
-  let state;
-
-  const mockErrors = [
-    { title: 'ActiveModel::MissingAttributeError: missing attribute: encrypted_password' },
-    { title: 'Grape::Exceptions::MethodNotAllowed: Grape::Exceptions::MethodNotAllowed' },
-    { title: 'NoMethodError: undefined method `sanitize_http_headers=' },
-    { title: 'NoMethodError: undefined method `pry' },
-  ];
-
-  beforeEach(() => {
-    state = {
-      errors: mockErrors,
-    };
-  });
-
-  describe('search results', () => {
-    it('should return errors filtered by words in title matching the query', () => {
-      const filteredErrors = getters.filterErrorsByTitle(state)('NoMethod');
-
-      expect(filteredErrors).not.toContainEqual(mockErrors[0]);
-      expect(filteredErrors.length).toBe(2);
-    });
-
-    it('should not return results if there is no matching query', () => {
-      const filteredErrors = getters.filterErrorsByTitle(state)('GitLab');
-
-      expect(filteredErrors.length).toBe(0);
-    });
-  });
-});