From 048e6db5facbd40306e06550b5758c929558491a Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Fri, 10 Apr 2020 09:37:39 -0500 Subject: [PATCH] v9.2.2-rc8 --- CHANGELOG.md | 1 + VERSION | 2 +- .../test/asset/criteria_retriever_test.exs | 19 +++++++------------ farmbot_core/test/project_test.exs | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 610a7d42..7f409175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Added coveralls test coverage reporter * Unit test additions (+2.7% coverage :tada:) * Updates to build instructions for third party developers + * Bug fix for criteria-based groups that have only one filter criteria. # 9.2.1 diff --git a/VERSION b/VERSION index fcecff17..9c0e1ab9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.2.2-rc7 +9.2.2-rc8 diff --git a/farmbot_core/test/asset/criteria_retriever_test.exs b/farmbot_core/test/asset/criteria_retriever_test.exs index 4b497196..404c8d2e 100644 --- a/farmbot_core/test/asset/criteria_retriever_test.exs +++ b/farmbot_core/test/asset/criteria_retriever_test.exs @@ -108,18 +108,13 @@ defmodule FarmbotCore.Asset.CriteriaRetrieverTest do end test "direct match on `pointer_type` via `string_eq`" do - point!(%{ - id: 42111, - gantry_mounted: false, - meta: %{}, - name: "Spinach", - plant_stage: "planned", - pointer_type: "Plant", - radius: 25.0, - x: 400.0, - y: 100.0, - z: 0.0 - }) + Repo.delete_all(PointGroup) + Repo.delete_all(Point) + + point!(%{id: 1, pointer_type: "Plant"}) + point!(%{id: 2, pointer_type: "Weed"}) + point!(%{id: 3, pointer_type: "ToolSlot"}) + point!(%{id: 4, pointer_type: "GenericPointer"}) result = CriteriaRetriever.run(@simple_point_group) assert Enum.count(result) == 1 diff --git a/farmbot_core/test/project_test.exs b/farmbot_core/test/project_test.exs index 0b6bbf70..d94e6d0d 100644 --- a/farmbot_core/test/project_test.exs +++ b/farmbot_core/test/project_test.exs @@ -1,6 +1,6 @@ defmodule FarmbotCore.ProjectTest do use ExUnit.Case - @opts [cd: Path.join("c_src", "farmbot-arduino-firmware")] + # @opts [cd: Path.join("c_src", "farmbot-arduino-firmware")] test "arduino_commit" do actual = FarmbotCore.Project.arduino_commit()