Merge pull request #10 from ZBoxApp/newTets

New tets

.travis.yml

+language: node_js
+
+node_js:
+  - "6.2"
+
+sudo: required
+
+before_script:
+  - echo "PLACE_HOLDER"
+
+script:
+  - npm run test

Vagrantfile

 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
 Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
   config.vm.box = "bento/centos-7.2"
@@ -25,21 +17,18 @@ Vagrant.configure(2) do |config|
   config.vm.network 'private_network', ip: '192.168.50.10'
   config.vm.hostname = 'zimbra.zboxapp.dev'
   config.vm.network 'forwarded_port', guest: 7071, host: 7071
-  config.vm.network 'forwarded_port', guest: 8081, host: 6081
-  config.vm.network 'forwarded_port', guest: 9081, host: 9081
   config.vm.network 'forwarded_port', guest: 443, host: 7443
   config.vm.network 'forwarded_port', guest: 80, host: 7080
-  config.vm.network 'forwarded_port', guest: 27017, host: 27017
 
 
   config.vm.provider 'virtualbox' do |v|
-    v.name = 'newManagerZimbra'
+    v.name = 'zimbra-admin-api-js'
     v.memory = 2048
     v.cpus = 2
   end
 
   config.vm.provider 'parallels' do |v|
-    v.name = 'newManagerZimbra'
+    v.name = 'zimbra-admin-api-js'
     v.memory = 2048
     v.cpus = 2
   end

package.json

@@ -2,10 +2,14 @@
   "name": "zimbra-admin-api-js",
   "version": "0.3.6",
   "main": "src/index.js",
+  "engines": {
+    "node": ">=6.2"
+  },
   "dependencies": {
     "crypto-browserify": "^3.11.0",
     "js-zimbra": "github:zboxapp/js-zimbra",
     "merge": "^1.2.0",
+    "object.entries": "^1.0.3",
     "options-api": "^1.1.0",
     "sprintf-js": "^1.0.3",
     "superagent": "^1.8.3",
@@ -35,7 +39,7 @@
     "webpack": "1.12.9"
   },
   "scripts": {
-    "test": "grunt mocha",
+    "test": "mocha",
     "build": "webpack",
     "dev": "WEBPACK_ENV=dev webpack --progress --colors --watch",
     "run": "webpack --progress --watch",

src/index.js

@@ -8,6 +8,12 @@ var pjson = require('../package.json');
 var Dictionary = require('./utils/dictionary.js');
 var ResponseParser = require('./utils/response_parser.js');
 var ErrorBuilder = require('./zimbra/error.js');
+var entries = require ('object.entries');
+
+// Hack Para que Object tenga entries
+if (!Object.entries) {
+    entries.shim();
+}
 
 // TODO: To many parseResponse types
 class ZimbraAdminApi {
@@ -678,8 +684,5 @@ class ZimbraAdminApi {
 
 }
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-  module.exports = ZimbraAdminApi;
-} else {
-  window.ZimbraAdminApi = ZimbraAdminApi;
-}
+
+module.exports = ZimbraAdminApi;

test/js/spec/test.js

-/* global describe, it, SpotifyWebApi, expect, beforeEach, afterEach, sinon */
+'use strict';
+
+var requireHelper = require('./require_helper'),
+    ZimbraAdminApi = requireHelper('index.js'),
+    expect = require('chai').expect,
+    superagent = require('superagent');
+
 (function() {
-  'use strict';
 
   var auth_data = {
-    'url': 'http://zimbra.zboxapp.dev:9000/service/admin/soap',
+    'url': 'https://localhost:7071/service/admin/soap',
     'user': 'admin@zboxapp.dev',
     'password':'12345678'
   };
@@ -12,6 +17,7 @@
     this.timeout(10000);
 
     it('Should remove the token', function(done){
+      console.log("HOLA------------")
       let api = new ZimbraAdminApi(auth_data);
       api.login(function(err, data){
         if (err) console.error(err);

test/require_helper.js

+// require_helper.js
+'use strict';
+
+module.exports = function (path) {
+    return require((process.env.APP_DIR_FOR_CODE_COVERAGE || '../src/') + path);
+};

vagrant/provision/playbook.yml

@@ -23,19 +23,3 @@
     - role: common
     - role: bertvv.bind
     - role: pbruna.zimbradev
-
-  tasks:
-    - name: Instala Mongo DB y dependencias
-      yum: name={{ item }} state=present
-      with_items:
-        - mongodb-org
-        - python-pymongo
-
-    - name: Configura mongo
-      copy: src=./roles/common/files/mongod.conf dest=/etc/mongod.conf
-
-    - name: Inicia servicio mongodb
-      service: name=mongod state=started enabled=yes
-
-    - name: Configura DB y usuario mongo
-      mongodb_user: database=manager name=manager password=manager state=present

vagrant/provision/roles/common/files/mongo.repo

-[mongodb-org-3.2]
-name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.2/x86_64/
-gpgcheck=1
-enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-3.2.asc

vagrant/provision/roles/common/files/mongod.conf

-# mongod.conf
-
-# for documentation of all options, see:
-#   http://docs.mongodb.org/manual/reference/configuration-options/
-
-# where to write logging data.
-systemLog:
-  destination: file
-  logAppend: true
-  path: /var/log/mongodb/mongod.log
-
-# Where and how to store data.
-storage:
-  dbPath: /var/lib/mongo
-  journal:
-    enabled: true
-#  engine:
-#  mmapv1:
-#  wiredTiger:
-
-# how the process runs
-processManagement:
-  fork: true  # fork and run in background
-  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-
-# network interfaces
-net:
-  port: 27017
-  bindIp: 0.0.0.0  # Listen to local interface only, comment to listen on all interfaces.
-
-
-#security:
-
-#operationProfiling:
-
-#replication:
-
-#sharding:
-
-## Enterprise-Only Options
-
-#auditLog:
-
-#snmp:

vagrant/provision/roles/common/files/nginx-env.conf

-env NODE_TLS_REJECT_UNAUTHORIZED=0;
-env zbox_rbac_config=/var/www/zbox-manager-rbac/config.json;

vagrant/provision/roles/common/files/passenger.conf

-passenger_root /usr/lib/ruby/1.8/phusion_passenger/locations.ini;
-passenger_ruby /opt/rh/ruby193/root/usr/bin/ruby;
-passenger_instance_registry_dir /var/run/passenger-instreg;

vagrant/provision/roles/common/files/passenger.repo

-[passenger]
-name=passenger
-baseurl=https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch
-repo_gpgcheck=1
-gpgcheck=0
-enabled=1
-gpgkey=https://packagecloud.io/gpg.key
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
-
-[passenger-source]
-name=passenger-source
-baseurl=https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/SRPMS
-repo_gpgcheck=1
-gpgcheck=0
-enabled=1
-gpgkey=https://packagecloud.io/gpg.key
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt

vagrant/provision/roles/common/files/pdns-nginx.conf

-upstream pdns {
-   server localhost:8091;
-}
-
-
-server {
-  listen  8081;
-  server_name pdns;
-
-  location / {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header x-api-key 'otto';
-    proxy_pass http://pdns/;
-    proxy_buffering off;
-    proxy_read_timeout 300s;
-    gzip off;
-  }
-
-  client_max_body_size 4G;
-  keepalive_timeout 10;
-}

vagrant/provision/roles/common/files/pdns.repo

-[pdns-MIND]
-name=PowerDNS server packages for RHEL6 and friends.
-baseurl=https://www.monshouwer.eu/download/3rd_party/pdns/el6/$basearch/
-gpgcheck=0
-enabled=1

vagrant/provision/roles/common/files/zbox-rbac-manager.conf

-# Conf para ZBOX-RBAC
-
-server {
-    listen       8070;
-    server_name  rbac-manager.zboxapp.com;
-
-    error_log /var/log/nginx/rbac-error.log warn;
-    access_log /var/log/nginx/rbac-access.log;
-
-    #ssl_ciphers  HIGH:!aNULL:!MD5;
-    #ssl_prefer_server_ciphers   on;
-
-    root /var/www/zbox-manager-rbac;
-    passenger_enabled on;
-    # Tell Passenger that your app is a Node.js app
-    passenger_app_type node;
-    passenger_startup_file /var/www/zbox-manager-rbac/lib/index.js;
-
-    gzip            on;
-    gzip_min_length 1000;
-    gzip_proxied    expired no-cache no-store private auth;
-    gzip_types      text/plain application/xml application/javascript application/json;
-
-  client_max_body_size 4G;
-  keepalive_timeout 10;
-
-}

vagrant/provision/roles/common/files/zboxrbac-conf.json

-{
- "port": 30000,
- "zimbra_url": "https://localhost:7071/service/admin/soap"
-}

vagrant/provision/roles/common/tasks/main.yml

 ---
-# tasks file for cartertdte.mta
-- name: RH Install epel-release
-  yum: name=epel-release update_cache=yes
+- name: Copia hosts
+  template:
+    src: hosts.j2
+    dest: /etc/hosts
+    owner: root
+    mode: '0644'
 
 - name: Deshabilita SELINUX
   lineinfile: dest=/etc/sysconfig/selinux regexp=^SELINUX= line=SELINUX=disabled
 
+- name: Copia repo de Nodejs
+  copy: src=node.repo dest=/etc/yum.repos.d/nodesource-el.repo
+
 - name: Instala paquetes Base
   yum: name={{ item }} state=present
   with_items:
     - "{{ system_packages }}"
 
-- name: Copia resolv.conf
-  copy: src=resolv.conf dest=/etc/resolv.conf
-
-- name: Copia pdns.repo
-  copy: src=pdns.repo dest=/etc/yum.repos.d/pdns.repo
-
-- name: Copia mongo.repo
-  copy: src=mongo.repo dest=/etc/yum.repos.d/mongo.repo
-
-- name: "Copia NGinx FS"
-  copy: src=nginx-filesystem-1.10.0-8.p5.0.29.el6.noarch.rpm dest=/tmp/nginx-filesystem-1.10.0-8.p5.0.29.el6.noarch.rpm
-
-
-- name: Copia repo de Nodejs
-  copy: src=node.repo dest=/etc/yum.repos.d/nodesource-el.repo
-
 - name: Desactiva SELINUX
   selinux: state=disabled
 
-
-- name: Instala todos los Fucking paquetes
-  yum: name={{ item }} state=present disable_gpg_check=yes
-  with_items:
-    - nodejs
-    - curl-devel
-    - GeoIP
-    - gd
-    - gperftools
-    - pcre
-    - libev
-    - git
-
-- name: Copia hosts
-  template:
-    src: hosts.j2
-    dest: /etc/hosts
-    owner: root
-    mode: '0644'
-
 - name: Desahbilita postfix
   service: name=postfix state=stopped enabled=no
 
 - name: Desahbilita iptables
   service: name=firewalld state=stopped enabled=no
+
+- name: Copia resolv.conf
+  copy: src=resolv.conf dest=/etc/resolv.conf

vagrant/provision/roles/common/templates/hosts.j2

 127.0.0.1 localhost.localdomain localhost
-{{ ansible_all_ipv4_addresses|last }} {{ansible_nodename}} {{ansible_hostname}}
+192.168.50.10 {{ansible_nodename}} {{ansible_hostname}}

vagrant/provision/roles/common/vars/main.yml

 ---
 # vars file for cartertdte.mta
 system_packages:
+  - epel-release
   - screen
   - wget
   - curl
@@ -18,6 +19,7 @@ system_packages:
   - bind-utils
   - tcpdump
   - tzdata
+  - tzdata-java
   - zsh
   - vim
   - dos2unix
@@ -25,3 +27,5 @@ system_packages:
   - python-pycurl
   - mailx
   - unzip
+  - git
+  - deltarpm

vagrant/provision/roles/pbruna.zimbradev/vars/main.yml

@@ -59,6 +59,14 @@ zimbra_domains:
   - name: 'zboxapp.com'
     bcategory: '76424135-5'
 
+  - name: 'big.com'
+    bcategory: '76424135-5'
+
+  - name: 'itlinux.cl'
+    bcategory: '13834853-9'
+    accounts:
+      - name: 'pbruna@itlinux.cl'
+      
   - name: 'customer.dev.archive'
     bcategory: '13834853-9'
     accounts: