summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-05 16:16:59 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-05 16:16:59 +0100
commit94c05d6bf2a8e513598a3b740505ebb59e5df0cf (patch)
tree71c4bee44ef0b56b988e8c5bf72df30eab90f4d7
parent911e4b168191e1c6f1857ac81e0fc4a69ebf1a01 (diff)
downloadgitlab-ce-fallback-localstorage-cases.tar.gz
Fix issue with browser support for instanceof extended Error builtinsfallback-localstorage-cases
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_manager.js3
-rw-r--r--spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js6
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index d8737463f01..9fea563370f 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -2,7 +2,6 @@ import FilteredSearchContainer from './container';
import RecentSearchesRoot from './recent_searches_root';
import RecentSearchesStore from './stores/recent_searches_store';
import RecentSearchesService from './services/recent_searches_service';
-import RecentSearchesServiceError from './services/recent_searches_service_error';
import eventHub from './event_hub';
class FilteredSearchManager {
@@ -26,7 +25,7 @@ class FilteredSearchManager {
// Fetch recent searches from localStorage
this.fetchingRecentSearchesPromise = this.recentSearchesService.fetch()
.catch((error) => {
- if (error instanceof RecentSearchesServiceError) return undefined;
+ if (error.name === 'RecentSearchesServiceError') return undefined;
// eslint-disable-next-line no-new
new window.Flash('An error occured while parsing recent searches');
// Gracefully fail to empty array
diff --git a/spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js b/spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js
index d11157f6e59..ea7c146fa4f 100644
--- a/spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js
+++ b/spec/javascripts/filtered_search/services/recent_searches_service_error_spec.js
@@ -7,9 +7,9 @@ describe('RecentSearchesServiceError', () => {
recentSearchesServiceError = new RecentSearchesServiceError();
});
- it('instantiates an instance of RecentSearchesServiceError and Error', () => {
- expect(recentSearchesServiceError instanceof Error).toBeTruthy();
- expect(recentSearchesServiceError instanceof RecentSearchesServiceError).toBeTruthy();
+ it('instantiates an instance of RecentSearchesServiceError and not an Error', () => {
+ expect(recentSearchesServiceError).toEqual(jasmine.any(RecentSearchesServiceError));
+ expect(recentSearchesServiceError.name).toBe('RecentSearchesServiceError');
});
it('should set a default message', () => {