Merge pull request #17 from ZBoxApp/fix-handleError

Fix handle error

package.json

 {
   "name": "zimbra-admin-api-js",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "main": "src/index.js",
   "engines": {
     "node": ">=6.2"

src/index.js

@@ -149,9 +149,9 @@ class ZimbraAdminApi {
     } else {
       const that = this;
       let getCallback = function(err, response){
-        if (err) return this.handleError(err);
+        if (err) return that.handleError(err);
         if (request_data.batch) return that.makeBatchRequest(request_data.requests, request_data.callback);
-        that.makeRequest(request_data);
+        that.makeRequest(request_data)
       };
       this.login(getCallback);
     }

test/test.js

@@ -18,7 +18,8 @@ var zimbraAdminPassword = process.env.ZIMBRA_PASSWORD || '12345678';
   var auth_data = {
     'url': zimbraURL,
     'user': zimbraAdminUser,
-    'password': zimbraAdminPassword
+    'password': zimbraAdminPassword,
+    'isAdmin': true
   };
 
   describe('Basic tests', function() {
@@ -376,7 +377,6 @@ var zimbraAdminPassword = process.env.ZIMBRA_PASSWORD || '12345678';
       let api = new ZimbraAdminApi(auth_data);
       api.getAccountMembership(account, function(err, data){
         if (err) return console.log(err);
-        console.log(data);
         expect(data.length).to.be.equal(0);
         done();
       });
@@ -829,71 +829,70 @@ var zimbraAdminPassword = process.env.ZIMBRA_PASSWORD || '12345678';
   });
   describe('COS tests', function() {
     this.timeout(5000);
+    let cos_name = Date.now().toString();
+    let cos_id;
 
     it('Should create a COS', function(done){
       let api = new ZimbraAdminApi(auth_data);
-      let cos_name = Date.now();
       let attrs={'zimbraFeatureContactsEnabled' : 'FALSE'};
       api.createCos(cos_name, attrs, function(err, cos){
         if (err) return console.error(err);
         expect(err).to.be.null;
+        cos_id = cos.id;
         done();
       });
     })
 
-    it('Should delete COS "unknow" ', function(done){
-      let api = new ZimbraAdminApi(auth_data);
-      api.getCos("unknow", function(err, cos){
-        if (err) return console.error(err);
-        let cosId = cos.id;
-        console.log(cosId);
-        api.deleteCos(cosId, function(err, res){
-          if (err) return console.error(err);
-          console.log(res);
-          expect(err).to.be.null;
-          done();
-        })
-      });
-    })
-
-    it('Should modify a Cos "basic"', function(done){
+    it('Should modify a Cos', function(done){
       let api = new ZimbraAdminApi(auth_data);
       let attrs = {'zimbraDumpsterEnabled' : 'TRUE'};
-      api.getCos("basic", function(err, cos){
+      api.getCos(cos_name, function(err, cos){
         if(err) return console.error(err);
         api.modifyCos(cos.id, attrs, function(err, res){
           if(err) return console.error(err);
-          console.log(res);
           expect(err).to.be.null;
           done();
         });
       });
     });
 
-    it('Should rename Cos "Basic"', function(done){
+    it.skip('Should rename Cos', function(done){
       let api = new ZimbraAdminApi(auth_data);
-      let newName = "basicv2"
-      api.getCos("basic", function(err, cos){
+      let newName = Date.now().toString();
+      api.getCos(cos_name, function(err, cos){
         if(err) return console.error(err);
         api.renameCos(cos.id, newName, function(err, res){
           if(err) return console.log(err);
-          console.log(res);
           expect(err).to.be.null;
           done();
         });
       });
     });
 
-    it.only('Should create a copy of Cos Professional', function(done){
+    it.skip('Should create a copy of Cos', function(done){
       let api = new ZimbraAdminApi(auth_data);
       let newCos = Date.now();
-      api.copyCos("professional", newCos, function(err, res){
+      api.copyCos(cos_name, newCos, function(err, res){
         if(err) return console.error(err);
         expect(err).to.be.null;
         done();
       })
     });
 
+    it('Should delete COS', function(done){
+      let api = new ZimbraAdminApi(auth_data);
+      api.getCos(cos_name, function(err, cos){
+        if (err) return console.error(err);
+        let cosId = cos.id;
+        console.log(cosId);
+        api.deleteCos(cosId, function(err, res){
+          if (err) return console.error(err);
+          expect(err).to.be.null;
+          done();
+        })
+      });
+    })
+
   });
 
   describe('DistributionList tests', function() {
@@ -953,7 +952,6 @@ var zimbraAdminPassword = process.env.ZIMBRA_PASSWORD || '12345678';
         let dl = data;
         api.addDistributionListAlias(dl.id, alias, function(err, data){
           if (err) return console.error(err);
-          console.log(data);
           expect(err).to.be.null;
           done();
         });
@@ -969,7 +967,6 @@ var zimbraAdminPassword = process.env.ZIMBRA_PASSWORD || '12345678';
           if (err) return console.error(err);
           api.removeDistributionListAlias(dl.id, alias, function(err, data){
             if (err) return console.error(err);
-            console.log(data);
             expect(err).to.be.null;
             done();
           });

vagrant/provision/playbook.yml

@@ -19,6 +19,10 @@
       - name: 'zimbra'
         ip: '192.168.50.10'
 
+  tasks:
+    - name: up network card
+      command: /usr/sbin/ifconfig eth1 up
+
   roles:
     - role: common
     - role: bertvv.bind

vagrant/provision/roles/bertvv.bind/tasks/main.yml

@@ -5,7 +5,7 @@
   yum:
     pkg: "{{ item }}"
     state: installed
-  with_items: bind_packages
+  with_items: "{{bind_packages}}"
   tags: bind
 
 - name: Create serial

vagrant/provision/roles/pbruna.zimbradev/templates/zimbra_configuration.conf.j2

@@ -16,3 +16,4 @@ EXPANDMENU="no"
 HOSTNAME="{{ ansible_nodename }}"
 DOTRAINSA="yes"
 ENABLEGALSYNCACCOUNTS=""
+INSTALL_PACKAGES="zimbra-core zimbra-ldap zimbra-logger zimbra-mta zimbra-snmp zimbra-store zimbra-apache zimbra-spell zimbra-convertd"
\ No newline at end of file