Merged branch master into master

abecms · Sep 26, 2016 · b5a909a · b5a909a
2 parents eb10101 + a56ca5f
commit b5a909a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,5 +6,6 @@ env:
 install:
   - npm install
 script:
-  - npm run lint
   - npm run test
+  - npm run lint
+
diff --git a/src/cli/helpers/abe-get-select-template-keys.js b/src/cli/helpers/abe-get-select-template-keys.js
@@ -84,10 +84,9 @@ var findRequestColumns = function(templatesList) {
             }
           })
         }
-        resolve(whereKeys)
       })
     })
-    reject()
+    resolve(whereKeys)
   })
 
   return p
@@ -100,7 +99,6 @@ var getSelectTemplateKeys = function(templatesPath) {
 
         findRequestColumns(templatesList)
           .then((whereKeys) => {
-
             resolve(whereKeys)
           },
           () => {

diff --git a/src/cli/models/Manager.js b/src/cli/models/Manager.js
@@ -64,9 +64,7 @@ class Manager {
           resolve()
         },
         () => {
-          // No where keys found
-          this.updateList()
-          resolve()
+          console.log('Manager._init', e)
         })
         .catch((e) => {
           console.log('Manager._init', e)

diff --git a/test/request.js b/test/request.js
@@ -7,11 +7,12 @@ describe('Request', function() {
    * 
    */
   it('Util.getAllAttributes()', function(done) {
-    this.timeout(4000)
+
     var Util = require('../src/cli').Util
     var attributes = Util.getAllAttributes("{{abe type='data' key='top_things_slider_highlight' desc='Automatic slider' source='select * from ../' editable='false'}}", {})
 
     chai.assert.equal(attributes.sourceString, 'select * from ../', 'sourceString is ok')
+    done();
   });
 
   /**