merge conflicts

[arvados-workbench2.git] / src / components / search-bar / search-bar.test.tsx

diff --git a/src/components/search-bar/search-bar.test.tsx b/src/components/search-bar/search-bar.test.tsx
index 2479e4011c3427bd296b5c2c712653fc50de3c62..07b5ebf6261dbab0849bad7e07df416ddaa49765 100644 (file)
--- a/src/components/search-bar/search-bar.test.tsx
+++ b/src/components/search-bar/search-bar.test.tsx
@@ -4,7 +4,7 @@
 
 import * as React from "react";
 import { mount, configure } from "enzyme";
-import SearchBar, { DEFAULT_SEARCH_DEBOUNCE } from "./search-bar";
+import { SearchBar, DEFAULT_SEARCH_DEBOUNCE } from "./search-bar";
 
 import * as Adapter from 'enzyme-adapter-react-16';
 
@@ -61,7 +61,7 @@ describe("<SearchBar />", () => {
             jest.advanceTimersByTime(DEFAULT_SEARCH_DEBOUNCE);
             expect(onSearch).toBeCalledWith("current value");
         });
-        
+
         it("calls onSearch after the time specified in props has passed", () => {
             const searchBar = mount(<SearchBar value="" onSearch={onSearch} debounce={2000}/>);
             searchBar.find("input").simulate("change", { target: { value: "current value" } });
@@ -70,7 +70,7 @@ describe("<SearchBar />", () => {
             jest.advanceTimersByTime(1000);
             expect(onSearch).toBeCalledWith("current value");
         });
-        
+
         it("calls onSearch only once after no change happened during the specified time", () => {
             const searchBar = mount(<SearchBar value="" onSearch={onSearch} debounce={1000}/>);
             searchBar.find("input").simulate("change", { target: { value: "current value" } });
@@ -79,7 +79,7 @@ describe("<SearchBar />", () => {
             jest.advanceTimersByTime(1000);
             expect(onSearch).toHaveBeenCalledTimes(1);
         });
-        
+
         it("calls onSearch again after the specified time has passed since previous call", () => {
             const searchBar = mount(<SearchBar value="" onSearch={onSearch} debounce={1000}/>);
             searchBar.find("input").simulate("change", { target: { value: "current value" } });
@@ -91,9 +91,7 @@ describe("<SearchBar />", () => {
             jest.advanceTimersByTime(1000);
             expect(onSearch).toBeCalledWith("latest value");
             expect(onSearch).toHaveBeenCalledTimes(2);
-            
-        });
 
+        });
     });
-
-});
\ No newline at end of file
+});