Skip to content
Snippets Groups Projects
Commit fa69a555 authored by Cam Saul's avatar Cam Saul
Browse files

test fix (?)

parent f78659b8
Branches
Tags
No related merge requests found
......@@ -84,14 +84,17 @@
(Some DBs like Postgres will get snippy if you don't use a `java.sql.Timestamp`)."
[]
(-> (java.util.Date.)
.getTime
.getTime ; time in milliseconds
(/ 1000) ; we don't care about the ms so strip them out
int
(* 1000)
(java.sql.Timestamp.)))
(defn parse-iso8601
"parse a string value expected in the iso8601 format into a `java.sql.Date`."
[datetime]
(some->> datetime
(time/parse (time/formatters :date-time))
(time/parse (time/formatters :date-time-no-ms))
(coerce/to-long)
(java.sql.Date.)))
......@@ -99,7 +102,7 @@
(defn now-iso8601
"format the current time as iso8601 date/time string."
[]
(time/unparse (time/formatters :date-time) (coerce/from-long (System/currentTimeMillis))))
(time/unparse (time/formatters :date-time-no-ms) (coerce/from-long (System/currentTimeMillis))))
(defn jdbc-clob-to-str
......
......@@ -3,6 +3,7 @@
(:require [expectations :refer :all]
[korma.core :refer :all]
[metabase.db :refer :all]
[metabase.http-client :refer :all]
[metabase.test-data :refer :all]
[metabase.models.session :refer [Session]]
[metabase.test.util :refer [expect-eval-actual-first]]))
......@@ -10,8 +11,9 @@
;; ## POST /api/session
;; Test that we can login
(expect-eval-actual-first
(sel :one :fields [Session :id] :user_id (user->id :rasta) (order :created_at :desc))
((user->client :rasta) :post 200 "session" (user->credentials :rasta)))
(sel :one :fields [Session :id] :user_id (user->id :rasta))
(do (del Session :user_id (user->id :rasta)) ; delete all other sessions for the bird first
(client :post 200 "session" (user->credentials :rasta))))
;; ## DELETE /api/session
;; Test that we can logout
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment