test fix

circle.yml

@@ -4,8 +4,5 @@ machine:
       oraclejdk8
 test:
   override:
-    - 'case $CIRCLE_NODE_INDEX in \
-         0) lein test;; \
-         1) MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; \
-      esac':
+    - case $CIRCLE_NODE_INDEX in 0) lein test;; 1) MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; esac:
         parallel: true

test/metabase/api/query_test.clj

@@ -206,38 +206,38 @@
                 :name "Test Database"
                 :organization_id @org-id
                 :description nil})]
-      [(match-$ query-1
-         {:creator rasta
-          :database_id (:id @test-db)
-          :name $
-          :type "rawsql"
-          :creator_id (user->id :rasta)
-          :updated_at $
-          :details {:timezone nil
-                    :sql "SELECT COUNT(*) FROM VENUES;"}
-          :id $
-          :database db
-          :version 1
-          :public_perms 0
-          :created_at $})
-       (match-$ query-2
-         {:creator rasta
-          :database_id (:id @test-db)
-          :name $
-          :type "rawsql"
-          :creator_id (user->id :rasta)
-          :updated_at $
-          :details {:timezone nil
-                    :sql "SELECT COUNT(*) FROM VENUES;"}
-          :id $
-          :database db
-          :version 1
-          :public_perms 0
-          :created_at $})])
+      #{(match-$ query-1
+          {:creator rasta
+           :database_id (:id @test-db)
+           :name $
+           :type "rawsql"
+           :creator_id (user->id :rasta)
+           :updated_at $
+           :details {:timezone nil
+                     :sql "SELECT COUNT(*) FROM VENUES;"}
+           :id $
+           :database db
+           :version 1
+           :public_perms 0
+           :created_at $})
+        (match-$ query-2
+          {:creator rasta
+           :database_id (:id @test-db)
+           :name $
+           :type "rawsql"
+           :creator_id (user->id :rasta)
+           :updated_at $
+           :details {:timezone nil
+                     :sql "SELECT COUNT(*) FROM VENUES;"}
+           :id $
+           :database db
+           :version 1
+           :public_perms 0
+           :created_at $})})
   (do (cascade-delete Query :database_id (:id @test-db))
       (create-query)
       (create-query)
-      ((user->client :rasta) :get 200 "query" :org @org-id)))
+      (set ((user->client :rasta) :get 200 "query" :org @org-id))))
 
 
 ;; ## POST /api/query/:id/csv