Merge pull request #31 from sbtqa/new-helper

Update allure helper

pom.xml

@@ -76,7 +76,7 @@
     <dependency>
       <groupId>ru.sbtqa.tag</groupId>
       <artifactId>allure-helper</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
       <type>jar</type>
     </dependency>
     <dependency>

src/main/java/ru/sbtqa/tag/pagefactory/stepdefs/SetupStepDefs.java

@@ -15,13 +15,17 @@
 import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ru.sbtqa.tag.allurehelper.ParamsHelper;
 import ru.sbtqa.tag.pagefactory.Page;
 import ru.sbtqa.tag.pagefactory.PageFactory;
 import ru.sbtqa.tag.pagefactory.annotations.ElementTitle;
 import ru.sbtqa.tag.pagefactory.exceptions.FactoryRuntimeException;
+import ru.sbtqa.tag.pagefactory.support.OnFailureScheduler;
 import ru.sbtqa.tag.qautils.properties.Props;
 import ru.sbtqa.tag.qautils.reflect.ClassUtilsExt;
 import ru.sbtqa.tag.qautils.reflect.FieldUtilsExt;
+import ru.sbtqa.tag.videorecorder.VideoRecorder;
+import ru.yandex.qatools.allure.cucumberjvm.AllureReporter;
 import ru.yandex.qatools.htmlelements.element.HtmlElement;
 
 public class SetupStepDefs {
@@ -30,6 +34,10 @@ public class SetupStepDefs {
 
     @Before()
     public void setUp() {
+
+        //Apply failure callback
+        AllureReporter.applyFailureCallback(OnFailureScheduler.class);
+
         //try to connect logger property file if exists
         String path = "src/test/resources/config/log4j.properties";
         if (new File(path).exists()) {
@@ -97,6 +105,13 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        if (VideoRecorder.getInstance().isVideoStarted()) {
+            String videoPath = VideoRecorder.getInstance().stopRecording();
+            if (videoPath != null) {
+                ParamsHelper.addVideoParameter(VideoRecorder.getInstance().getVideoPath());
+                VideoRecorder.getInstance().resetVideoRecorder();
+            }
+        }
         PageFactory.dispose();
     }
 }

src/main/java/ru/sbtqa/tag/pagefactory/support/OnFailureScheduler.java

@@ -0,0 +1,29 @@
+package ru.sbtqa.tag.pagefactory.support;
+
+import ru.sbtqa.tag.allurehelper.ParamsHelper;
+import ru.sbtqa.tag.qautils.properties.Props;
+import ru.sbtqa.tag.videorecorder.VideoRecorder;
+import ru.yandex.qatools.allure.cucumberjvm.callback.OnFailureCallback;
+
+public class OnFailureScheduler implements OnFailureCallback {
+
+    private void takeScreenshot() {
+        String screenshotStrategy = Props.get("screenshot.strategy", "raw");
+
+        switch (screenshotStrategy) {
+            case "driver":
+                ScreenShooter.takeWithDriver();
+                break;
+            case "raw":
+            default:
+                ScreenShooter.takeRaw();
+                break;
+        }
+    }
+
+    @Override
+    public Object call() {   
+        takeScreenshot();
+        return null;
+    }
+}