minor fix

salesforce · Feb 17, 2017 · 4a961af · 4a961af
1 parent 3bf136b
commit 4a961af
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/api/v1/controllers/subjects.js b/api/v1/controllers/subjects.js
@@ -195,11 +195,7 @@ module.exports = {
     // Filter Parameter Validation
     for (let i = 0; i < filterParams.length; i++) {
       if (params[filterParams[i]].value) {
-
-
-
-
-        (params[filterParams[i]].value.split(','));
+        validateFilterParams(params[filterParams[i]].value.split(','));
       }
     }
 

diff --git a/api/v1/controllers/utils.js b/api/v1/controllers/utils.js
@@ -1,4 +1,14 @@
+/**
+ * Copyright (c) 2016, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
 
+ /**
+ * api/v1/controllers/utils.js
+ */
 const ZERO = 0;
 const ONE = 1;
 

diff --git a/api/v1/helpers/verbs/utils.js b/api/v1/helpers/verbs/utils.js
@@ -7,7 +7,7 @@
  */
 
 /**
- * api/v1/controllers/utils.js
+ * api/v1/helpers/verbs/utils.js
  */
 'use strict';
 

diff --git a/tests/api/v1/subjects/getHierarchyAspectAndTagsFilters.js b/tests/api/v1/subjects/getHierarchyAspectAndTagsFilters.js
@@ -245,15 +245,13 @@ describe(`api: GET ${path}:`, () => {
       api.get(endpoint)
       .set('Authorization', token)
       .expect(constants.httpStatus.BAD_REQUEST)
-      .expect((res) => {
-        expect(res.body.errors[0].type).to
-        .equal('InvalidFilterParameterError');
-      })
-      .end((err /* , res */) => {
+      .end((err, res ) => {
         if (err) {
           return done(err);
         }
 
+        expect(res.body.errors[0].type).to
+        .equal('InvalidFilterParameterError');
         done();
       });
     });
@@ -374,7 +372,11 @@ describe(`api: GET ${path}:`, () => {
       api.get(endpoint2)
       .set('Authorization', token)
       .expect(constants.httpStatus.OK)
-      .expect((res) => {
+      .end((err, res ) => {
+        if (err) {
+          return done(err);
+        }
+
         expect(res.body).to.not.equal(null);
         expect(res.body.samples).to.have.length(2);
         expect(res.body.samples[1]).to.have.deep
@@ -384,12 +386,6 @@ describe(`api: GET ${path}:`, () => {
         expect(res.body.children[0].children).to.have.length(0);
         expect(res.body.children[0].samples[0]).to.have.deep
           .property('aspect.name', 'humidity');
-      })
-      .end((err /* , res */) => {
-        if (err) {
-          return done(err);
-        }
-
         done();
       });
     });