made cloud tests work again.
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
(use-fixtures :each wrap-setup)
|
||||
(deftest transaction-page
|
||||
(testing "transaction page"
|
||||
(dc/transact conn
|
||||
@(dc/transact conn
|
||||
[(new-client {:db/id "client"})
|
||||
(new-transaction {:transaction/client "client"})])
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
(deftest invoice-page
|
||||
(testing "invoice page"
|
||||
(dc/transact conn
|
||||
@(dc/transact conn
|
||||
[(new-client {:db/id "client"})
|
||||
(new-invoice {:invoice/client "client"
|
||||
:invoice/status :invoice-status/paid})])
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
(deftest upsert-transaction-rule
|
||||
(let [{:strs [vendor-id account-id yodlee-merchant-id]} (->
|
||||
(dc/transact
|
||||
@(dc/transact
|
||||
conn
|
||||
[{:vendor/name "Bryce's Meat Co"
|
||||
:db/id "vendor-id"}
|
||||
@@ -190,7 +190,7 @@
|
||||
|
||||
(deftest test-transaction-rule
|
||||
(testing "it should match rules"
|
||||
(let [matching-transaction (dc/transact conn
|
||||
(let [matching-transaction @(dc/transact conn
|
||||
[{:transaction/description-original "matching-desc"
|
||||
:transaction/date #inst "2019-01-05T00:00:00.000-08:00"
|
||||
:transaction/client {:client/name "1"
|
||||
@@ -248,7 +248,7 @@
|
||||
|
||||
(deftest test-match-transaction-rule
|
||||
(testing "it should apply a rules"
|
||||
(let [{:strs [transaction-id transaction-rule-id uneven-transaction-rule-id]} (-> (dc/transact conn
|
||||
(let [{:strs [transaction-id transaction-rule-id uneven-transaction-rule-id]} (-> @(dc/transact conn
|
||||
[{:transaction/description-original "matching-desc"
|
||||
:transaction/date #inst "2019-01-05T00:00:00.000-08:00"
|
||||
:transaction/client {:client/name "1"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
(deftest test-account-search
|
||||
(testing "It should find matching account names"
|
||||
(dc/transact conn [{:account/name "Food Research"
|
||||
@(dc/transact conn [{:account/name "Food Research"
|
||||
:db/ident :client-specific-account
|
||||
:account/numeric-code 51100
|
||||
:account/search-terms "Food Research"
|
||||
@@ -29,7 +29,7 @@
|
||||
))
|
||||
1)))
|
||||
(testing "It should filter out accounts that are not allowed for clients"
|
||||
(dc/transact conn [{:account/name "CLIENT SPECIFIC"
|
||||
@(dc/transact conn [{:account/name "CLIENT SPECIFIC"
|
||||
:db/ident :client-specific-account
|
||||
:account/numeric-code 99999
|
||||
:account/search-terms "CLIENTSPECIFIC"
|
||||
@@ -42,7 +42,7 @@
|
||||
)))
|
||||
|
||||
(testing "It should show up for the client specific version"
|
||||
(let [client-id (-> (dc/transact conn [{:client/name "CLIENT"
|
||||
(let [client-id (-> @(dc/transact conn [{:client/name "CLIENT"
|
||||
:db/id "client"}
|
||||
{:db/ident :client-specific-account
|
||||
:account/client-overrides [{:account-client-override/client "client"
|
||||
@@ -57,7 +57,7 @@
|
||||
nil))))))
|
||||
|
||||
(testing "It should hide accounts that arent applicable"
|
||||
(dc/transact conn [{:account/name "DENIED"
|
||||
@(dc/transact conn [{:account/name "DENIED"
|
||||
:db/ident :denied-account
|
||||
:account/numeric-code 99998
|
||||
:account/search-terms "DENIED"
|
||||
@@ -78,7 +78,7 @@
|
||||
nil)))))
|
||||
|
||||
(testing "It should warn when using a warn account"
|
||||
(dc/transact conn [{:account/name "WARNING"
|
||||
@(dc/transact conn [{:account/name "WARNING"
|
||||
:db/ident :warn-account
|
||||
:account/numeric-code 99997
|
||||
:account/search-terms "WARNING"
|
||||
@@ -100,7 +100,7 @@
|
||||
:allowance :vendor}
|
||||
nil))))))
|
||||
(testing "It should only include admin accounts for admins"
|
||||
(dc/transact conn [{:account/name "ADMINONLY"
|
||||
@(dc/transact conn [{:account/name "ADMINONLY"
|
||||
:db/ident :warn-account
|
||||
:account/numeric-code 99997
|
||||
:account/search-terms "ADMINONLY"
|
||||
@@ -117,7 +117,7 @@
|
||||
nil)))))
|
||||
|
||||
(testing "It should allow searching for vendor accounts for invoices"
|
||||
(let [vendor-id (-> (dc/transact conn [{:account/name "VENDORONLY"
|
||||
(let [vendor-id (-> @(dc/transact conn [{:account/name "VENDORONLY"
|
||||
:db/id "vendor-only"
|
||||
:db/ident :vendor-only
|
||||
:account/numeric-code 99996
|
||||
@@ -145,7 +145,7 @@
|
||||
|
||||
(deftest get-graphql
|
||||
(testing "should retrieve a single account"
|
||||
(dc/transact conn [{:account/numeric-code 1
|
||||
@(dc/transact conn [{:account/numeric-code 1
|
||||
:account/default-allowance :allowance/allowed
|
||||
:account/type :account-type/asset
|
||||
:account/location "A"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
(deftest get-payment-page
|
||||
(testing "Should list payments"
|
||||
(let [{{:strs [bank-id check-id client-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [bank-id check-id client-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client"
|
||||
:db/id "client-id"}
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
(deftest void-payment
|
||||
(testing "Should void payments"
|
||||
(let [{{:strs [bank-id check-id client-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [bank-id check-id client-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client"
|
||||
:db/id "client-id"}
|
||||
@@ -97,7 +97,7 @@
|
||||
:db/ident)))))
|
||||
|
||||
(testing "Should not void payments if account is locked"
|
||||
(let [{{:strs [check-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client"
|
||||
:db/id "client-id"
|
||||
@@ -110,7 +110,7 @@
|
||||
(deftest void-payments
|
||||
(testing "bulk void"
|
||||
(testing "Should bulk void payments if account is not locked"
|
||||
(let [{{:strs [check-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client-new"
|
||||
:db/id "client-id"}
|
||||
@@ -123,7 +123,7 @@
|
||||
:db/ident)))))
|
||||
|
||||
(testing "Should only void a payment if it matches filter criteria"
|
||||
(let [{{:strs [check-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client-new"
|
||||
:db/id "client-id"}
|
||||
@@ -136,7 +136,7 @@
|
||||
:db/ident)))))
|
||||
|
||||
(testing "Should not bulk void payments if account is locked"
|
||||
(let [{{:strs [check-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client"
|
||||
:db/id "client-id"
|
||||
@@ -150,7 +150,7 @@
|
||||
:db/ident)))))
|
||||
|
||||
(testing "Only admins should be able to bulk void"
|
||||
(let [{{:strs [check-id]} :tempids} (d/transact conn [{:bank-account/code "bank"
|
||||
(let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}
|
||||
{:client/code "client"
|
||||
:db/id "client-id"}
|
||||
@@ -163,7 +163,7 @@
|
||||
(deftest print-checks
|
||||
(testing "Print checks"
|
||||
(testing "Should allow 'printing' cash checks"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn [{:client/code "client"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client"
|
||||
:db/id "client-id"
|
||||
:client/locked-until #inst "2030-01-01"
|
||||
:client/bank-accounts [{:bank-account/code "bank"
|
||||
@@ -211,7 +211,7 @@
|
||||
:id))))))))
|
||||
|
||||
(testing "Should allow 'printing' debit checks"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn [{:client/code "client"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client"
|
||||
:db/id "client-id"
|
||||
:client/bank-accounts [{:bank-account/code "bank"
|
||||
:db/id "bank-id"}]}
|
||||
@@ -258,7 +258,7 @@
|
||||
:id)))))))))
|
||||
|
||||
(testing "Should allow printing checks"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn [{:client/code "client"
|
||||
(let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client"
|
||||
:db/id "client-id"
|
||||
:client/bank-accounts [{:bank-account/code "bank"
|
||||
:bank-account/type :bank-account-type/check
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
line-2-1
|
||||
line-2-2
|
||||
line-3-1
|
||||
line-3-2]} (:tempids (d/transact conn [{:db/id "test-account-1"
|
||||
line-3-2]} (:tempids @(d/transact conn [{:db/id "test-account-1"
|
||||
:account/type :account-type/asset}
|
||||
{:db/id "test-account-2"
|
||||
:account/type :account-type/equity}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
(testing "should allow editing a user"
|
||||
|
||||
|
||||
(let [{{:strs [user-id] } :tempids} (d/transact conn [{:db/id "user-id" :user/name "Bryce"}])
|
||||
(let [{{:strs [user-id] } :tempids} @(d/transact conn [{:db/id "user-id" :user/name "Bryce"}])
|
||||
result (sut/edit-user {:id (admin-token)} {:edit_user {:role :power_user :id user-id}} nil)]
|
||||
(is (some? (:id result))
|
||||
(= :power_user (:role result)))
|
||||
(testing "Should allow adding clients"
|
||||
(let [{{:strs [client-id] } :tempids} (d/transact conn [{:db/id "client-id" :client/name "Bryce"}])
|
||||
(let [{{:strs [client-id] } :tempids} @(d/transact conn [{:db/id "client-id" :client/name "Bryce"}])
|
||||
result (sut/edit-user {:id (admin-token)} {:edit_user {:role :power_user
|
||||
:id user-id
|
||||
:clients [(str client-id)]}} nil)]
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
:invoice/outstanding-balance 39.88
|
||||
}]
|
||||
(map #(dissoc % :invoice/expense-accounts :db/id)
|
||||
(sut/extract-invoice-details "ntg-invoices/Cintas/123"
|
||||
(sut/extract-invoice-details "ntg-invoices/Cintas/123.zcic"
|
||||
(io/input-stream (io/resource "test-cintas/o.zcic.230310093903"))
|
||||
[client]))))))
|
||||
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
(ns auto-ap.integration.util
|
||||
(:require [datomic.api :as dc]
|
||||
[auto-ap.datomic :refer [conn transact-schema]]
|
||||
[auto-ap.datomic :refer [conn transact-schema install-functions]]
|
||||
[clj-time.core :as time]))
|
||||
|
||||
(defn wrap-setup
|
||||
[f]
|
||||
(with-redefs [auto-ap.datomic/uri "datomic:mem://test"]
|
||||
(dc/create-database auto-ap.datomic/uri)
|
||||
(with-redefs [auto-ap.datomic/conn auto-ap.datomic/uri]
|
||||
(with-redefs [auto-ap.datomic/conn (dc/connect auto-ap.datomic/uri)]
|
||||
(transact-schema conn)
|
||||
(install-functions)
|
||||
(f)
|
||||
(dc/delete-database auto-ap.datomic/uri))))
|
||||
|
||||
@@ -100,7 +101,7 @@
|
||||
(dissoc x :id))
|
||||
|
||||
(defn setup-test-data [data]
|
||||
(:tempids (dc/transact conn (into data
|
||||
(:tempids @(dc/transact conn (into data
|
||||
[(test-account :db/id "test-account-id")
|
||||
(test-client :db/id "test-client-id"
|
||||
:client/bank-accounts [(test-bank-account :db/id "test-bank-account-id")])
|
||||
@@ -112,4 +113,4 @@
|
||||
:account/account-set "default"}]))))
|
||||
|
||||
(defn apply-tx [data]
|
||||
(:db-after (dc/transact conn data)))
|
||||
(:db-after @(dc/transact conn data)))
|
||||
|
||||
Reference in New Issue
Block a user