+
${this.renderLines(iconDom, label, alternativeName)}
`;
}
diff --git a/src/scss/includes/search_form.scss b/src/scss/includes/search_form.scss
index dfbbc5d14..076911d4e 100644
--- a/src/scss/includes/search_form.scss
+++ b/src/scss/includes/search_form.scss
@@ -189,7 +189,6 @@ input[type="search"] {
display: inline-block;
width: calc(100% - 50px);
text-overflow:ellipsis;
- text-transform: capitalize;
overflow: hidden;
white-space: nowrap;
}
@@ -200,21 +199,12 @@ input[type="search"] {
font-size: 14px;
margin-left: 37px;
text-overflow:ellipsis;
- text-transform: capitalize;
overflow: hidden;
white-space: nowrap;
}
-.autocomplete_suggestion--history {
- color : $secondary_text;
-}
-
-.autocomplete_suggestion--history .autocomplete_prefix {
- color : $primary_text;
-}
-
-.autocomplete_prefix {
- color : $primary_text;
+.autocomplete_suggestion--category {
+ text-transform: capitalize;
}
.top_bar--small {
diff --git a/tests/__data__/autocomplete.json b/tests/__data__/autocomplete.json
index 01f8b22ed..683159a69 100644
--- a/tests/__data__/autocomplete.json
+++ b/tests/__data__/autocomplete.json
@@ -8,8 +8,8 @@
"geocoding": {
"id": "osm:node:4872758213",
"type": "poi",
- "label": "test Dsquared2",
- "name": "test Dsquared2",
+ "label": "test result 1",
+ "name": "test result 1",
"postcode": null,
"city": null,
"citycode": null,
diff --git a/tests/integration/helpers/response_handler.js b/tests/integration/helpers/response_handler.js
index 31b1989d1..8c430cd33 100644
--- a/tests/integration/helpers/response_handler.js
+++ b/tests/integration/helpers/response_handler.js
@@ -20,6 +20,10 @@ export default class ResponseHandler {
}
}
+ reset() {
+ this.preparedResponses = [];
+ }
+
async prepareResponse() {
await this.page.setRequestInterception(true);
this.page.on('request', async interceptedRequest => {
diff --git a/tests/integration/tests/autocomplete.js b/tests/integration/tests/autocomplete.js
index 43c9a362f..8dbf433ca 100644
--- a/tests/integration/tests/autocomplete.js
+++ b/tests/integration/tests/autocomplete.js
@@ -64,8 +64,7 @@ test('search has lang in query', async() => {
test('keyboard navigation', async() => {
const TypedSearch = 'Hello';
- responseHandler.addPreparedResponse(mockAutocomplete, /Hello/);
- responseHandler.addPreparedResponse(mockAutocomplete, /square/);
+ responseHandler.addPreparedResponse(mockAutocomplete, /autocomplete/);
await page.goto(APP_URL);
await autocompleteHelper.typeAndWait(TypedSearch);
await wait(100);
@@ -158,7 +157,7 @@ test('move to on click', async() => {
test('bbox & center', async() => {
expect.assertions(3);
- responseHandler.addPreparedResponse(mockAutocomplete, /autocomplete\?q=Hello/);
+ responseHandler.addPreparedResponse(mockAutocomplete, /autocomplete/);
await page.goto(APP_URL);
await page.keyboard.type('Hello');
await wait(100);
@@ -306,8 +305,27 @@ test('Retrieve restaurant category when we search "restau"', async() => {
expect(suggestionId).toEqual('category:restaurant');
});
+test('Retrieve no category when we search "barcelona", not even "bar"', async() => {
+ const searchQuery = 'barcelona';
+
+ responseHandler.addPreparedResponse(mockAutocomplete, /autocomplete\?q=barcelona/);
+
+ await page.goto(APP_URL);
+ await page.keyboard.type(searchQuery);
+ await page.waitForSelector('.autocomplete_suggestion');
+
+ const firstLine = await page.evaluate(() => {
+ return document.querySelector(
+ '.autocomplete_suggestion:first-child .autocomplete_suggestion__first_line'
+ ).innerText;
+ });
+
+ expect(firstLine).toEqual('test result 1');
+});
+
afterEach(async() => {
await clearStore(page);
+ responseHandler.reset();
});
afterAll(async() => {