refs

deoxyseia · Sep 28, 2017 · 0425f9d · 0425f9d
1 parent de19f58
commit 0425f9d
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -120,3 +120,4 @@ nbproject
 !/logs/.gitkeep
 /config/mssqlconfig.js
 /www/
+/kongadata/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -132,4 +132,7 @@ All notable changes to this project will be documented in this file.
 
 ## [0.8.6](https://github.com/pantsel/konga/releases/tag/v0.8.6) - 24-9-2017
 
-* Fix broken dependencies.
+## [0.8.7](https://github.com/pantsel/konga/releases/tag/v0.8.7) - 29-9-2017
+
+* [FIX] Tests are working again.
+* [FIX] <code>kongadata</code> dir is now created inside the project folder by default.
diff --git a/Dockerfile b/Dockerfile
@@ -16,8 +16,8 @@ RUN npm --unsafe-perm --verbose install --production
 
 EXPOSE 1337
 
-RUN chmod 777 ./start.sh
-
 VOLUME /kongadata
 
+RUN chmod 777 ./start.sh
+
 ENTRYPOINT ["/bin/bash","./start.sh"]
diff --git a/api/controllers/UserController.js b/api/controllers/UserController.js
@@ -58,13 +58,13 @@ module.exports = _.merge(_.cloneDeep(require('../base/Controller')), {
                 }
 
 
-                if(!passports) return res.json(updated)
+                if(!passports) return res.json(user)
 
                 sails.models.passport
                     .update({user:req.param('id')},{password:passports.password})
                     .exec(function(err,updatedPassport){
                         if(err) return res.negotiate(err);
-                        return  res.json(updated)
+                        return  res.json(user)
                     })
 
 

diff --git a/assets/js/app/connections/connections-controller.js b/assets/js/app/connections/connections-controller.js
@@ -241,7 +241,7 @@
                             node : isActive(node) ? null : node
                         }).then(function onSuccess(res) {
                         var credentials = $localStorage.credentials
-                        var user = res.data[0];
+                        var user = res.data;
                         if(!user.node) {
                             delete credentials.user.node;
                         } else{
@@ -270,7 +270,7 @@
                                             node : result.data
                                         }).then(function onSuccess(res) {
                                         var credentials = $localStorage.credentials
-                                        var user = res.data[0];
+                                        var user = res.data;
                                         if(!user.node) {
                                             delete credentials.user.node;
                                         } else{

diff --git a/assets/js/app/users/user-controller.js b/assets/js/app/users/user-controller.js
@@ -57,7 +57,7 @@
                           $scope.showForm = false;
                           MessageService.success('User "' + $scope.user.username + '" updated successfully');
                           initUserPassports()
-                          UserService.updateUser(data.data[0],true)
+                          UserService.updateUser(data.data,true)
                           deferred.resolve(true);
                       },function(err){
                           console.log("Err",err)

diff --git a/config/bootstrap.js b/config/bootstrap.js
@@ -11,7 +11,7 @@ module.exports.bootstrap = function bootstrap(next) {
 
 
     // Create Konga data directories
-    var dirs = [( process.env.STORAGE_PATH || '/kongadata/' ), ( process.env.STORAGE_PATH || '/kongadata/' )+ 'uploads']
+    var dirs = [( process.env.STORAGE_PATH || './kongadata/' ), ( process.env.STORAGE_PATH || './kongadata/' )+ 'uploads']
 
 
     dirs.forEach(function(dir){

diff --git a/config/connections.js b/config/connections.js
@@ -28,7 +28,7 @@ module.exports.connections = {
    */
   localDiskDb: {
     adapter: 'sails-disk',
-    filePath:  process.env.NODE_ENV == 'test' ? './.tmp/' : ( process.env.STORAGE_PATH || '/kongadata/' ),
+    filePath:  process.env.NODE_ENV == 'test' ? './.tmp/' : ( process.env.STORAGE_PATH || './kongadata/' ),
     fileName: process.env.NODE_ENV == 'test' ? 'localDiskDb.db' : 'konga.db'
   },
 

diff --git a/config/paths.js b/config/paths.js
@@ -3,5 +3,5 @@
  */
 
 module.exports.paths = {
-    "uploads" : ( process.env.STORAGE_PATH || '/kongadata/' )+ 'uploads/'
+    "uploads" : ( process.env.STORAGE_PATH || './kongadata/' )+ 'uploads/'
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kongadmin",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Kong admin GUI",
   "keywords": [
     "sails.js",

diff --git a/test/fixtures/User.json b/test/fixtures/User.json
@@ -5,6 +5,7 @@
     "email": "[email protected]",
     "firstName": "Arnold",
     "lastName": "Administrator",
+    "active": true,
     "admin": true
   },
   {
@@ -14,6 +15,7 @@
     "firstName": "John",
     "lastName": "Doe",
     "admin": false,
+    "active": true,
     "createdUser": 1,
     "updatedUser": 1
   }

diff --git a/test/functional/common/controller.test.js b/test/functional/common/controller.test.js
@@ -10,7 +10,7 @@ describe('Generic controller test', function controllerTest() {
     [
         {
             controller: 'UserController',
-            url: '/user/',
+            url: '/api/user/',
             identifier: 1,
             count: 2,
             data: {
@@ -19,28 +19,31 @@ describe('Generic controller test', function controllerTest() {
                     email: "[email protected]",
                     firstName: "Arnold",
                     lastName: "Administrator",
+                    active: true,
                     admin: true
                 },
                 newRecord: {
                     username: "schwarzenegger",
                     email: "[email protected]",
                     firstName: "Arnold",
                     lastName: "Schwarzenegger",
+                    active: true,
                     admin: false
                 },
                 updateRecord: {
                     username: "stallone",
                     email: "[email protected]",
                     firstName: "Sylvester",
                     lastName: "Stallone",
+                    active: true,
                     admin: false
                 }
 
             }
         },
         {
             controller: 'KongNodeController',
-            url: '/kongnode/',
+            url: '/api/kongnode/',
             identifier: 1,
             count: 1,
             data: {