Merge branch 'master' into mixed-maps

stathissideris · Apr 30, 2018 · 9603a4d · 9603a4d
2 parents 6bdc6c5 + a424d52
commit 9603a4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/spec_provider/provider.cljc b/src/spec_provider/provider.cljc
@@ -107,7 +107,7 @@
                 (apply concat))))))
 
 (defn- qualified-key? [k] (some? (namespace k)))
-(defn- qualify-key [k ns] (keyword (str ns) (name k)))
+(defn- qualify-key [k ns] (if (namespace k) k (keyword (str ns) (name k))))
 
 (declare summarize-stats*)
 (defn- summarize-non-keyword-map [keys-stats ns spec-name options]

diff --git a/test/spec_provider/trace_test.clj b/test/spec_provider/trace_test.clj
@@ -137,7 +137,8 @@
      (foo1 1 2 [[3 4] 5] 6 7 {:foo 8 :bar 9} {})
      (foo1 1 2 [[3 4] 5] 6 7 {:foo 8 :bar 9} {:bar "also string"}))
 
-   (sut/pprint-fn-specs 'spec-provider.trace-test/foo1 'spec-provider.trace-test 's))
+   ;;(sut/pprint-fn-specs 'spec-provider.trace-test/foo1 'spec-provider.trace-test 's)
+   )
 
   (testing "test 2"
    (sut/instrument