Skip to content
Snippets Groups Projects
Commit 75cd68a4 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

return the whole definition of a segment with the revision diff, not just the filter clause itself.

parent 4abdbb2e
No related branches found
No related tags found
No related merge requests found
......@@ -153,8 +153,8 @@
(cond-> (merge-with merge
(u/update-values (:after base-diff) (fn [v] {:after v}))
(u/update-values (:before base-diff) (fn [v] {:before v})))
(get-in base-diff [:after :definition]) (assoc :definition {:before (get-in segment1 [:definition :filter])
:after (get-in segment2 [:definition :filter])})))))
(get-in base-diff [:after :definition]) (assoc :definition {:before (get-in segment1 [:definition])
:after (get-in segment2 [:definition])})))))
(extend SegmentEntity
revision/IRevisioned
......
......@@ -202,8 +202,8 @@
;; diff-segments
(expect
{:definition {:before ["AND" [">" 4 "2014-10-19"]]
:after ["AND" ["BETWEEN" 4 "2014-07-01" "2014-10-19"]]}
{:definition {:before {:filter ["AND" [">" 4 "2014-10-19"]]}
:after {:filter ["AND" ["BETWEEN" 4 "2014-07-01" "2014-10-19"]]}}
:description {:before "Lookin' for a jedi"
:after "BBB"}
:name {:before "Droids in the desert"
......@@ -224,7 +224,7 @@
:description "BBB"
:definition {:filter ["AND",["BETWEEN",4,"2014-07-01","2014-10-19"]]}))))))
;; test case where difinition doesn't change
;; test case where definition doesn't change
(expect
{:name {:before "A"
:after "B"}}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment