From 58deed97f81df1c8676f50dba415811458cf0fe1 Mon Sep 17 00:00:00 2001
From: Nico Schedel <nschedel@sipwise.com>
Date: Fri, 25 Oct 2019 12:36:52 +0200
Subject: [PATCH] TT#68016 selenium: simplify get_text_safe()

FirefoxExtensions.pm:
- made get_text_safe function much simpler

Change-Id: I971c2a37290723144441f5e1f10382514b850fef
(cherry picked from commit d4a98876c702a1aeeea21e14912cc0d794547cec)
---
 .../Remote/Driver/FirefoxExtensions.pm        | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/t/lib/Selenium/Remote/Driver/FirefoxExtensions.pm b/t/lib/Selenium/Remote/Driver/FirefoxExtensions.pm
index 2dc01b9e4b..506e1f5de5 100644
--- a/t/lib/Selenium/Remote/Driver/FirefoxExtensions.pm
+++ b/t/lib/Selenium/Remote/Driver/FirefoxExtensions.pm
@@ -163,24 +163,12 @@ sub wait_for_attribute {
 }
 
 sub get_text_safe {
-    my ($self, $path, $type) = @_;
-    $type = "xpath" unless $type;
-    if($type eq "css"){
-        try {
-            my $element = $self->find_element_by_css($path);
-            return $element->get_text();
-        } catch {
-            return 0;
-        };
-    } elsif($type eq "xpath"){
-        try {
-            my $element = $self->find_element_by_xpath($path);
-            return $element->get_text();
-        } catch {
-         return 0;
-        };
-    } else {
-        return "Unknown Element Type: " . $type;
-    }
+    my ($self, $path) = @_;
+    try {
+        my $element = $self->find_element($path);
+        return $element->get_text();
+    } catch {
+        return 'Element not found';
+    };
 }
 1;