From 488ee13f0895e081f158ea4421149e2e0df7c826 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 10 Nov 2026 21:46:48 +0100 Subject: [PATCH] :paperclip: Use this branch's compositions alias in develop's combine tests The same-name combine tests that develop added build their file with the `tho` alias, which this branch's variant workspace tests name `ctho`, so the frontend test run stopped with a ReferenceError there. Harness only; the benchmark is not run. Also in this commit: - Re-record the combine golden master for unique variant values. Combining two components whose names leave no value gives the second variant "Value 2" where it had an empty value, since develop's fix for same-name combines (#12881). Case au records that combine, so its two variants are recorded again on purpose; no other case changes. AI-assisted-by: claude-opus-5-5 --- .../test/frontend_tests/composable_tests/golden_master.edn | 4 ++-- .../test/frontend_tests/data/workspace_variants_test.cljs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/test/frontend_tests/composable_tests/golden_master.edn b/frontend/test/frontend_tests/composable_tests/golden_master.edn index 08d369159c..9254e7543c 100644 --- a/frontend/test/frontend_tests/composable_tests/golden_master.edn +++ b/frontend/test/frontend_tests/composable_tests/golden_master.edn @@ -64,8 +64,8 @@ {:transcript " {:component \"main\", :id sync-main-component}\n {:component \"main\", :copy sync-main-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n one-of -> \n {:action :transform, :params {:target #fn}, :component-ids [6]}\n \n {:target #fn, :value \"Value 2\", :pos 0}", :states ["19168567c3f4c8b1" "cfce0b246967964a" "2c3ef0411b35a158" "0d456e1108bb1756"]} {:transcript " {:component \"main\", :id sync-main-component}\n {:component \"main\", :copy sync-main-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n one-of -> \n {:action :shortcut, :params {:kind :create-component, :targets [#fn]}, :component-ids [6]}\n \n {:target #fn, :value \"Value 2\", :pos 0}", :states ["19168567c3f4c8b1" "cfce0b246967964a" "2c3ef0411b35a158" "0d456e1108bb1756"]}] :case-au-combined-components-keep-their-copies - [{:transcript " {:component \"first\", :id sync-first-component}\n {:component \"second\", :id sync-second-component}\n {:component \"first\", :copy sync-first-copyhead-0}\n {:component \"second\", :copy sync-second-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n {:action :combine, :params {:targets [#fn #fn], :selected? nil}, :component-ids []}\n \n {:target #fn, :value #fn, :pos 0}", :states ["61c776d9e973c9dd" "0f68af4cace0f325" "97651ebcd2334fe5" "47fc4c7f440fdc13"]} - {:transcript " {:component \"first\", :id sync-first-component}\n {:component \"second\", :id sync-second-component}\n {:component \"first\", :copy sync-first-copyhead-0}\n {:component \"second\", :copy sync-second-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n {:action :combine, :params {:targets [#fn #fn], :selected? true}, :component-ids []}\n \n {:target #fn, :value #fn, :pos 0}", :states ["61c776d9e973c9dd" "0f68af4cace0f325" "97651ebcd2334fe5" "47fc4c7f440fdc13"]}] + [{:transcript " {:component \"first\", :id sync-first-component}\n {:component \"second\", :id sync-second-component}\n {:component \"first\", :copy sync-first-copyhead-0}\n {:component \"second\", :copy sync-second-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n {:action :combine, :params {:targets [#fn #fn], :selected? nil}, :component-ids []}\n \n {:target #fn, :value #fn, :pos 0}", :states ["61c776d9e973c9dd" "3b83145364c8803f" "fef3f0e37f0a0102" "e55f14872c42c586"]} + {:transcript " {:component \"first\", :id sync-first-component}\n {:component \"second\", :id sync-second-component}\n {:component \"first\", :copy sync-first-copyhead-0}\n {:component \"second\", :copy sync-second-copyhead-0}\n {:target #fn, :property :fills, :value \"#00ff00\"}\n {:action :combine, :params {:targets [#fn #fn], :selected? true}, :component-ids []}\n \n {:target #fn, :value #fn, :pos 0}", :states ["61c776d9e973c9dd" "3b83145364c8803f" "fef3f0e37f0a0102" "e55f14872c42c586"]}] :case-av-variant-rename-reaches-copy-names [{:transcript " {:component \"main\", :id sync-main-component}\n {:variant-set \"vset\", :variant-id sync-vset-vcontainer, :count 2}\n {:component \"main\", :level 0, :outer sync-main-outercomp-0}\n {:component \"main\", :copy sync-main-copyhead-0}\n {:target #fn, :property :name, :value \"Mine\"}\n {:action :rename, :params {:target #fn, :name \"Renamed\"}, :component-ids []}", :states ["c6e889ca261596ce" "940f36855f4f991d" "92ebbb582ece2af2"]} {:transcript " {:component \"main\", :id sync-main-component}\n {:variant-set \"vset\", :variant-id sync-vset-vcontainer, :count 2}\n {:component \"main\", :level 0, :outer sync-main-outercomp-0}\n {:component \"main\", :copy sync-main-copyhead-0}\n one-of -> \n {:action :rename, :params {:target #fn, :name \"Renamed\"}, :component-ids []}", :states ["5eb544d7e28709d7" "e76ffcfb4eccd16d"]}] diff --git a/frontend/test/frontend_tests/data/workspace_variants_test.cljs b/frontend/test/frontend_tests/data/workspace_variants_test.cljs index 80d8cc5214..5cf893cfee 100644 --- a/frontend/test/frontend_tests/data/workspace_variants_test.cljs +++ b/frontend/test/frontend_tests/data/workspace_variants_test.cljs @@ -203,11 +203,11 @@ (defn- three-same-name-mains-file [] (-> (cthf/sample-file :file1) - (tho/add-simple-component :c01 :m01 :r01 + (ctho/add-simple-component :c01 :m01 :r01 :root-params {:name "Tag" :x 0 :y 0 :width 100 :height 80}) - (tho/add-simple-component :c02 :m02 :r02 + (ctho/add-simple-component :c02 :m02 :r02 :root-params {:name "Tag" :x 150 :y 0 :width 100 :height 80}) - (tho/add-simple-component :c03 :m03 :r03 + (ctho/add-simple-component :c03 :m03 :r03 :root-params {:name "Tag" :x 300 :y 0 :width 100 :height 80}))) (defn- path-named-main-file