Fix profiles merging when using expand

Author: weavejester

src/integrant/core.cljc

@@ -551,7 +551,7 @@
    (walk/postwalk #(if (profile? %) (deprofile-1 % profile-keys) %) coll)))
 
 (defn- normal-map? [x]
-  (and (map? x) (not (reflike? x))))
+  (and (map? x) (not (reflike? x)) (not (profile? x))))
 
 (defn- nested-values [idx [k v]]
   (if (and (normal-map? v) (seq v))

test/integrant/core_test.cljc

@@ -731,4 +731,8 @@
     (is (= (ig/expand {::mod-prof 1} (ig/deprofile [:dev]))
            {::a {:dev 1}}))
     (is (= (ig/expand {::mod-prof 2} (ig/deprofile [:test]))
-           {::a {:test 2}}))))
+           {::a {:test 2}}))
+    (is (= (-> {::x (ig/profile {:a 1, :b 2})}
+               (ig/expand (ig/deprofile [:a]))
+               (ig/deprofile [:a]))
+           {::x 1}))))