Merge branch 'develop' of github.com:thedevs-network/kutt into develop

client/actions/__test__/url.js

@@ -138,7 +138,7 @@ describe('url actions', () => {
         }
       })
         .post('/api/url/deleteurl')
-        .reply(200, { message: 'Sort URL deleted successfully' });
+        .reply(200, { message: 'Short URL deleted successfully' });
 
       const store = mockStore({ url: { list: mockedItems } });
 

server/controllers/urlController.js

@@ -276,7 +276,7 @@ exports.deleteUrl = async ({ body: { id, domain }, user }, res) => {
   if (!urls && !urls.length) return res.status(400).json({ error: "Couldn't find the short URL." });
   redis.del(id + (customDomain || ''));
   const response = await deleteUrl({ id, domain: customDomain, user });
-  if (response) return res.status(200).json({ message: 'Sort URL deleted successfully' });
+  if (response) return res.status(200).json({ message: 'Short URL deleted successfully' });
   return res.status(400).json({ error: "Couldn't delete short URL." });
 };
 

server/server.js

@@ -17,6 +17,7 @@ const {
 } = require('./controllers/validateBodyController');
 const auth = require('./controllers/authController');
 const url = require('./controllers/urlController');
+const neo4j = require('./db/neo4j');
 
 require('./cron');
 require('./passport');
@@ -27,10 +28,12 @@ if (process.env.RAVEN_DSN) {
 const catchErrors = fn => (req, res, next) =>
   fn(req, res, next).catch(err => {
     res.status(500).json({ error: 'Sorry an error ocurred. Please try again later.' });
+    neo4j.close();
     if (process.env.RAVEN_DSN) {
       Raven.captureException(err, {
         user: { email: req.user && req.user.email },
       });
+      throw new Error(err);
     } else {
       throw new Error(err);
     }