test: Fix tests to pass

liquidz · Oct 12, 2024 · 80dd7bd · 80dd7bd
1 parent bb16717
commit 80dd7bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/example-plugin/plugin.edn b/example-plugin/plugin.edn
@@ -1,3 +1,3 @@
 {:name "elin core example plugin"
- :handlers [elin-example.core/hello]
- :interceptors [elin-example.core/interceptor]}
+ :export {:handler {:includes [elin-example.core/hello]}
+          :interceptor {:includes [elin-example.core/interceptor]}}}
diff --git a/test/elin/component/interceptor_test.clj b/test/elin/component/interceptor_test.clj
@@ -83,7 +83,7 @@
                 sut/wrap-interceptor-for-logging identity]
     (t/testing "only includes"
       (t/is (= {::test [test-interceptor]}
-               (-> {:includes [(symbol #'test-interceptor)]}
+               (-> {:base-config {:includes [(symbol #'test-interceptor)]}}
                    (sut/map->Interceptor)
                    (component/start)
                    (:interceptor-map)))))
@@ -96,8 +96,8 @@
 
     (t/testing "includes and excludes"
       (t/is (= {::test [test-interceptor]}
-               (-> {:includes [(symbol #'test-interceptor)]
-                    :excludes [(symbol #'test-interceptor)]}
+               (-> {:base-config {:includes [(symbol #'test-interceptor)]
+                                  :excludes [(symbol #'test-interceptor)]}}
                    (sut/map->Interceptor)
                    (component/start)
                    (:interceptor-map)))
@@ -106,7 +106,7 @@
 (t/deftest new-interceptor-configure-includes-excludes-test
   (with-redefs [m/validate (constantly true)
                 sut/wrap-interceptor-for-logging identity]
-    (let [interceptor (-> {:includes [(symbol #'test-interceptor)]}
+    (let [interceptor (-> {:base-config {:includes [(symbol #'test-interceptor)]}}
                           (sut/map->Interceptor)
                           (component/start))]
       (t/testing "only includes"

diff --git a/test/elin/component/plugin_test.clj b/test/elin/component/plugin_test.clj
@@ -17,8 +17,8 @@
                                      (component/start-system))]
     (try
       (t/is (= {:name (str ::sut/plugin)
-                :handlers '[elin-example.core/hello]
-                :interceptors '[elin-example.core/interceptor]}
+                :export {:handler {:includes '[elin-example.core/hello]}
+                         :interceptor {:includes '[elin-example.core/interceptor]}}}
                (:loaded-plugin plugin)))
       (finally
         (component/stop-system sys)))))
@@ -28,9 +28,7 @@
                                      (select-keys [:lazy-host :plugin])
                                      (component/start-system))]
     (try
-      (t/is (= {:name (str ::sut/plugin)
-                :handlers []
-                :interceptors []}
+      (t/is (= {:name (str ::sut/plugin)}
                (:loaded-plugin plugin)))
       (finally
         (component/stop-system sys)))))