From 4a60911c9ad74086c00a6d8ec8588d54b1876de9 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 22 Apr 2020 09:58:53 +0200
Subject: [PATCH] fix: lint and test for SearchableInput ok

---
 .../SearchResults/SearchResults.spec.js         |  1 +
 .../features/SearchResults/SearchResults.vue    | 12 +++++++++---
 .../SearchableInput/SearchableInput.spec.js     | 17 ++++++++++-------
 webapp/locales/de.json                          |  2 +-
 webapp/locales/en.json                          |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/webapp/components/_new/features/SearchResults/SearchResults.spec.js b/webapp/components/_new/features/SearchResults/SearchResults.spec.js
index b7c396068..b52f20568 100644
--- a/webapp/components/_new/features/SearchResults/SearchResults.spec.js
+++ b/webapp/components/_new/features/SearchResults/SearchResults.spec.js
@@ -46,6 +46,7 @@ describe('SearchResults', () => {
 
       describe('contains posts', () => {
         beforeEach(() => {
+          console.log
           wrapper.setData({ posts: [post], activeTab: 'Post' })
         })
 
diff --git a/webapp/components/_new/features/SearchResults/SearchResults.vue b/webapp/components/_new/features/SearchResults/SearchResults.vue
index 7188a3acf..73ad3feb0 100644
--- a/webapp/components/_new/features/SearchResults/SearchResults.vue
+++ b/webapp/components/_new/features/SearchResults/SearchResults.vue
@@ -1,14 +1,20 @@
 <template>
   <div id="search-results" class="search-results">
-    <div class="search-results">
-      {{ $t('search.results', { searchCount: searchCount, search: search }) }}
+    <div>
+      <ds-section>
+        <ds-text class="search-results">
+          <strong>{{ searchCount }}</strong>
+          {{ $t('search.results') }}
+        </ds-text>
+      </ds-section>
     </div>
+
     <tab-navigation :tabs="tabOptions" :activeTab="activeTab" @switchTab="switchTab" />
     <section
       :class="['results', activeTab === 'User' && '--user', !activeResourceCount > 0 && '--empty']"
     >
       <hc-empty
-        v-if="!activeResourceCount"
+        v-if="!activeResourceCount || searchCount === 0"
         icon="tasks"
         :message="$t('search.no-results', { search })"
       />
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.spec.js b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
index 59315808e..69e881683 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.spec.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
@@ -60,13 +60,6 @@ describe('SearchableInput.vue', () => {
       expect(select.element.value).toBe('abcd')
     })
 
-    it('searches for the term when enter is pressed', async () => {
-      select.element.value = 'ab'
-      select.trigger('input')
-      select.trigger('keyup.enter')
-      await expect(wrapper.emitted().query[0]).toEqual(['ab'])
-    })
-
     it('calls onDelete when the delete key is pressed', () => {
       const spy = jest.spyOn(wrapper.vm, 'onDelete')
       select.trigger('input')
@@ -117,5 +110,15 @@ describe('SearchableInput.vue', () => {
         expect(mocks.$router.push).toHaveBeenCalledWith('?hashtag=Hashtag')
       })
     })
+
+    it('searches for the term when enter is pressed', async () => {
+      select.element.value = 'ab'
+      select.trigger('input')
+      select.trigger('keyup.enter')
+      expect(mocks.$router.push).toHaveBeenCalledWith({
+        path: '/search/search-results',
+        query: { search: 'ab' },
+      })
+    })
   })
 })
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index aa359af1d..1ef28847f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -595,7 +595,7 @@
       "User": "Benutzer"
     },
     "hint": "Wonach suchst Du?",
-    "results": " \"{searchCount}\" Ergebnisse für \"{search}\" gefunden ",
+    "results": "Ergebnisse gefunden ",
     "no-results": "Keine Ergebnisse für \"{search}\" gefunden. Versuch' es mit einem anderen Begriff!",
     "placeholder": "Suchen"
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f3e99ad76..2fef1b291 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -595,7 +595,7 @@
       "User": "Users"
     },
     "hint": "What are you searching for?",
-    "results": " \"{searchCount}\" Results found for \"{search}\" ",
+    "results": "{searchCount} Results founding",
     "no-results": "No results found for \"{search}\". Try a different search term!",
     "placeholder": "Search"
   },