Merge hotfix-search into stable

deploy/production/docker-compose.yml

@@ -34,7 +34,7 @@ sphinx:
     - "127.0.0.1:9306:9306"
   restart: always
 app:
-  image: "quay.io/dipstudio/libertysoil:1.7.1"
+  image: "quay.io/dipstudio/libertysoil:1.7.2"
   ports:
     - "127.0.0.1:8000:8000"
   links:
@@ -49,7 +49,7 @@ app:
     - "./secrets.env"
   restart: always
 queue:
-  image: "quay.io/dipstudio/libertysoil:1.7.1"
+  image: "quay.io/dipstudio/libertysoil:1.7.2"
   links:
     - db
     - redis

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libertysoil",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Libertysoil.org website",
   "license": "AGPL-3.0+",
   "repository": {

src/api/client.js

@@ -50,15 +50,13 @@ export default class ApiClient
       defaultHeaders = { Cookie: this.serverReq.headers['cookie'] };
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrlForFetch(relativeUrl, query),
       {
         credentials: 'same-origin',
         headers: defaultHeaders
       }
     );
-
-    return Promise.resolve(req);
   }
 
   async head(relativeUrl, query = {}) {
@@ -68,16 +66,14 @@ export default class ApiClient
       defaultHeaders = { Cookie: this.serverReq.headers['cookie'] };
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrlForFetch(relativeUrl, query),
       {
         credentials: 'same-origin',
         method: 'HEAD',
         headers: defaultHeaders
       }
     );
-
-    return Promise.resolve(req);
   }
 
   async del(relativeUrl) {
@@ -87,16 +83,14 @@ export default class ApiClient
       defaultHeaders = { Cookie: this.serverReq.headers['cookie'] };
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrlForFetch(relativeUrl),
       {
         credentials: 'same-origin',
         method: 'DELETE',
         headers: defaultHeaders
       }
     );
-
-    return Promise.resolve(req);
   }
 
   async post(relativeUrl, data = null) {
@@ -116,7 +110,7 @@ export default class ApiClient
       body = stringify(data);
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -125,8 +119,6 @@ export default class ApiClient
         body
       }
     );
-
-    return Promise.resolve(req);
   }
 
   /*
@@ -147,7 +139,7 @@ export default class ApiClient
       body = data;
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -156,8 +148,6 @@ export default class ApiClient
         body
       }
     );
-
-    return Promise.resolve(req);
   }
 
   async postJSON(relativeUrl, data = null) {
@@ -177,7 +167,7 @@ export default class ApiClient
       body = JSON.stringify(data);
     }
 
-    const req = fetch(
+    return fetch(
       this.apiUrl(relativeUrl),
       {
         credentials: 'same-origin',
@@ -186,8 +176,6 @@ export default class ApiClient
         body
       }
     );
-
-    return Promise.resolve(req);
   }
 
   async subscriptions(offset = 0) {
@@ -469,7 +457,7 @@ export default class ApiClient
 
   async search(query) {
     const response = await this.get(`/api/v1/search/${query}`);
-    return response.body;
+    return await response.json();
   }
 
   async tagCloud() {
@@ -499,7 +487,7 @@ export default class ApiClient
 
   async searchSchools(query) {
     const response = await this.get(`/api/v1/schools/search/${query}`);
-    return response.body;
+    return await response.json();
   }
 
   async followSchool(name) {
@@ -585,14 +573,10 @@ export default class ApiClient
   }
 
   async saveComment(postId, commentId, text) {
-    try {
-      const response = await this.post(`/api/v1/post/${postId}/comment/${commentId}`, {
-        text
-      });
-      return response.body;
-    } catch (err) {
-      return err.response.body;
-    }
+    const response = await this.post(`/api/v1/post/${postId}/comment/${commentId}`, {
+      text
+    });
+    return await response.json();
   }
 
   async subscribeToPost(postId) {

src/components/footer.js

@@ -31,7 +31,7 @@ const FooterComponent = () => (
       <a href="mailto:info@libertysoil.org">info@libertysoil.org</a>
     </p>
     <p>
-      <a href="https://github.com/Lokiedu/libertysoil-site/milestones">Version 1.7.1</a>
+      <a href="https://github.com/Lokiedu/libertysoil-site/milestones">Version 1.7.2</a>
     </p>
     <script async data-trackduck-id="56182f159e7749be13765442" src="//d1ks1friyst4m3.cloudfront.net/toolbar/prod/td.js"></script>
   </footer>

test/integration/api/client.js

@@ -83,6 +83,12 @@ describe('Client test', () => {
     expect(result.error, 'to be', 'You are not authorized');
   });
 
+  it('#search works', async () => {
+    const result = await client.search('test');
+
+    expect(result, 'to be an', 'object');
+    expect(result, 'to have key', 'error');
+  });
 });
 
 describe('Authenticated client test', () => {