fix(queryBuilder): Fix unit tests

two merge errors, one real bug
QutEcoacoustics · Sep 16, 2016 · 907e31f · 907e31f
1 parent c7c5fbf
commit 907e31f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/services/queryBuilder.js b/src/components/services/queryBuilder.js
@@ -401,7 +401,7 @@ angular
                 const queryStringWhiteList = {
                     filter: filterToQueryString,
                     paging: (pagingObject) => Object.entries(pagingObject),
-                    projection: (projectionObject) => Object.entries(projectionObject).map(([k,v]) => ["projection_" + k, v]),
+                    projection: (projectionObject) => Object.entries(projectionObject).map(([k,v]) => ["projection_" + k, v.join(",")]),
                     sorting: (sortObject) => Object.entries(sortObject)
                 };
 

diff --git a/src/components/services/queryBuilder.spec.js b/src/components/services/queryBuilder.spec.js
@@ -924,7 +924,7 @@ describe("The QueryBuilder", function () {
     it("should be able to load a very complex query", function () {
         var actual = queryBuilder.load(complexExpected);
 
-        expect(actual.toJSON(spaces)).toBe(j(complexExpected));
+        expect(j(actual.toJSON())).toBe(j(complexExpected));
     });
 
     describe("URL subset", function () {
@@ -979,7 +979,7 @@ describe("The QueryBuilder", function () {
                     {page: 1, items: 10}
                 ).end();
 
-            expect(actual.toJSON(spaces)).toBe(j(expectedFilter));
+            expect(j(actual.toJSON())).toBe(j(expectedFilter));
 
             let qsObj = actual.toQueryString();
             let url = $url.formatUri("www.test.com/index.html", qsObj);