From 0927a2b44b0c486f3d82a15763ff70a0c38c85e4 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2024 15:55:26 +0100
Subject: [PATCH] update tests

---
 src/test/test.cpp            |  7 +++++++
 src/test/test.h              |  2 +-
 src/web/WebStatusService.cpp | 30 ++++++++++++++++++++----------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/test/test.cpp b/src/test/test.cpp
index 05a3f791b..a79d9bee8 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -1029,11 +1029,18 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
             // request.url("/rest/action");
             // EMSESP::webStatusService.action(&request, doc.as<JsonVariant>());
 
+            // should show dev version and be updatable
             char data5[] = "{\"action\":\"checkUpgrade\", \"param\":\"3.7.1-dev.99,3.7.0\"}";
             deserializeJson(doc, data5);
             request.url("/rest/action");
             EMSESP::webStatusService.action(&request, doc.as<JsonVariant>());
 
+            // should show dev version and not be updatable
+            char data6[] = "{\"action\":\"checkUpgrade\", \"param\":\"3.7.1-dev.4,3.7.0\"}";
+            deserializeJson(doc, data6);
+            request.url("/rest/action");
+            EMSESP::webStatusService.action(&request, doc.as<JsonVariant>());
+
             // char data6[] = "{\"device\":\"system\", \"cmd\":\"read\",\"value\":\"8 2 27 1\"}";
             // deserializeJson(doc, data6);
             // json = doc.as<JsonVariant>();
diff --git a/src/test/test.h b/src/test/test.h
index e2c6fd94e..e979985b7 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -41,7 +41,7 @@ namespace emsesp {
 // #define EMSESP_DEBUG_DEFAULT "310"
 // #define EMSESP_DEBUG_DEFAULT "render"
 // #define EMSESP_DEBUG_DEFAULT "api"
-// #define EMSESP_DEBUG_DEFAULT "api3"
+#define EMSESP_DEBUG_DEFAULT "api3"
 // #define EMSESP_DEBUG_DEFAULT "crash"
 // #define EMSESP_DEBUG_DEFAULT "dv"
 // #define EMSESP_DEBUG_DEFAULT "lastcode"
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index 85999d688..5309a423c 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -204,29 +204,39 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
 
 // action = checkUpgrade
 bool WebStatusService::checkUpgrade(JsonObject root, std::string & versions) {
-    root["emsesp_version"] = EMSESP_APP_VERSION; // always send back current version
-
-    // versions holds the latest development version and stable version in one string, comma separated
-    std::string latest_dev_version    = versions.substr(0, versions.find(','));
-    std::string latest_stable_version = versions.substr(versions.find(',') + 1);
+    std::string current_version;
+#ifndef EMSESP_STANDALONE
+    current_version = EMSESP_APP_VERSION; // always send back current version
+#else
+    // for testing only
+    // current_version = "3.6.5";
+    current_version = "3.7.0-dev-7";
+#endif
 
     if (!versions.empty()) {
-        version::Semver200_version this_version(EMSESP_APP_VERSION); // current version
-        bool                       using_dev_version = !this_version.prerelease().empty();
+        // versions holds the latest development version and stable version in one string, comma separated
+        std::string latest_dev_version    = versions.substr(0, versions.find(','));
+        std::string latest_stable_version = versions.substr(versions.find(',') + 1);
+
+        version::Semver200_version this_version(current_version);
+        bool                       using_dev_version = !this_version.prerelease().find("dev");
         version::Semver200_version latest_version(using_dev_version ? latest_dev_version : latest_stable_version); // latest version
 
         root["upgradeable"] = (latest_version > this_version);
 
 #if defined(EMSESP_DEBUG)
-        emsesp::EMSESP::logger().debug("Checking for version upgrade. This version=%s, latest dev=%s, latest stable=%s. Upgradeable=%s",
-                                       EMSESP_APP_VERSION,
+        emsesp::EMSESP::logger().debug("Checking for version upgrade. This version=%s, latest dev=%s, latest stable=%s. Using %s releases. Upgradeable=%s",
+                                       current_version.c_str(),
                                        latest_dev_version.c_str(),
                                        latest_stable_version.c_str(),
+                                       using_dev_version ? "dev" : "stable",
                                        root["upgradeable"].as<bool>() ? "true" : "false");
 #endif
     }
 
-    return true; // always ok
+    root["emsesp_version"] = current_version;
+
+    return true;
 }
 
 // action = allvalues