diff --git a/frontend/src/app/main/data/workspace/branches.cljs b/frontend/src/app/main/data/workspace/branches.cljs index 7239edf693..21484ca2ee 100644 --- a/frontend/src/app/main/data/workspace/branches.cljs +++ b/frontend/src/app/main/data/workspace/branches.cljs @@ -412,7 +412,7 @@ (let [excluded (or excluded #{}) include? (if (some? include?) include? - (not (every? excluded change-keys)))] + (every? excluded change-keys))] (if include? (apply disj excluded change-keys) (into excluded change-keys))))))))) diff --git a/frontend/test/frontend_tests/data/workspace_branches_test.cljs b/frontend/test/frontend_tests/data/workspace_branches_test.cljs index a87cecca61..d07bf69b8c 100644 --- a/frontend/test/frontend_tests/data/workspace_branches_test.cljs +++ b/frontend/test/frontend_tests/data/workspace_branches_test.cljs @@ -187,7 +187,8 @@ (t/testing "the other direction starts the selection over" (ptk/emit! store (dwb/fetch-branch-diff (:id branch) :main->branch)) (t/is (= #{} (get-in @store [:workspace-branch-diff :excluded])))) - (rx/dispose! store))) + (rx/dispose! store)) + (done')) done)))) (t/deftest the-selection-travels-with-the-merge-and-update-calls