Merge pull request #323 from SvetlanaUtina/selenoid-name-of-test

Selenoid name of test
sbtqa · Oct 29, 2020 · fb7915f · fb7915f
2 parents 7388414 + 8305ed9
commit fb7915f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/page-factory-doc/src/main/asciidoc/web_properties.asciidoc b/page-factory-doc/src/main/asciidoc/web_properties.asciidoc
@@ -135,7 +135,7 @@ http://proxy.com:8080
 |selenoid.enableVNC = true
 |selenoid.screenResolution
 | Разрешение экрана
-selenoid.screenResolution = 1280x1024x24
+|selenoid.screenResolution = 1280x1024x24
 |selenoid.enableVideo
 | Включение/выключение записи видео
 |selenoid.enableVideo = true
@@ -149,7 +149,7 @@ selenoid.video.name = my-cool-video.mp4
 | Количество кадров в секунду
 |selenoid.video.frameRate = 24
 |selenoid.nameOfTests
-| Имя теста
+| Имя теста, по умолчанию наименование берется из названия сценария (для cucumber сценария)
 |selenoid.nameOfTests = myCoolTestName
 |selenoid.timeZone
 | Таймзона

diff --git a/...n/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/SelenoidCapabilitiesParser.java b/...n/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/SelenoidCapabilitiesParser.java
@@ -8,6 +8,7 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ru.sbtqa.tag.pagefactory.environment.Environment;
 import ru.sbtqa.tag.pagefactory.web.environment.WebEnvironment;
 import ru.sbtqa.tag.pagefactory.web.properties.WebConfiguration;
 
@@ -30,7 +31,13 @@ public DesiredCapabilities parse() {
         setCapability("videoName", PROPERTIES.getSelenoidVideoName(), VIDEONAME_FORMAT);
         setCapability("videoScreenSize", PROPERTIES.getSelenoidVideoScreenSize());
         setCapability("videoFrameRate", PROPERTIES.getSelenoidVideoFrameRate());
-        setCapability("name", PROPERTIES.getSelenoidNameOfTests());
+        String selenoidName;
+        if (PROPERTIES.getSelenoidNameOfTests().trim().isEmpty() && Environment.getScenario() != null) {
+            selenoidName = Environment.getScenario().getName();
+        } else {
+            selenoidName = PROPERTIES.getSelenoidNameOfTests();
+        }
+        setCapability("name", selenoidName);
         setCapability("timeZone", PROPERTIES.getSelenoidTimeZone());
         setCapability("hostsEntries", PROPERTIES.getSelenoidHostEntries());
         setCapability("applicationContainers", PROPERTIES.getSelenoidApplicationContainers());