From 9311fea09b7eefb3cdcd3f266099348019b82484 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 26 May 2015 07:55:39 -0400
Subject: [PATCH] Add utility functiion to get an elemet's text content also when running tests in PhantomJS
---
tests/Selenium/bootstrap.php | 5 +++++
tests/Selenium/Mail/Getunread.php | 2 +-
tests/Selenium/Mail/List.php | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/Selenium/Mail/Getunread.php b/tests/Selenium/Mail/Getunread.php
index 16b6bd1..c18ddc0 100644
--- a/tests/Selenium/Mail/Getunread.php
+++ b/tests/Selenium/Mail/Getunread.php
@@ -32,6 +32,6 @@
$this->assertHasClass('unread', $li);
$badge = $this->byCssSelector('.folderlist li.inbox span.unreadcount');
- $this->assertEquals(strval($this->msgcount), $badge->text());
+ $this->assertEquals(strval($this->msgcount), $this->getText($badge));
}
}
diff --git a/tests/Selenium/Mail/List.php b/tests/Selenium/Mail/List.php
index 88fdb25..dc28577 100644
--- a/tests/Selenium/Mail/List.php
+++ b/tests/Selenium/Mail/List.php
@@ -42,7 +42,7 @@
$this->assertHasClass('unread', $row);
$subject = $this->byCssSelector('.messagelist tbody tr:first-child td.subject');
- $this->assertEquals('Lines', $subject->text());
+ $this->assertEquals('Lines', $this->getText($subject));
$icon = $this->byCssSelector('.messagelist tbody tr:first-child td.status span');
$this->assertHasClass('unread', $icon);
diff --git a/tests/Selenium/bootstrap.php b/tests/Selenium/bootstrap.php
index cf547df..dc4897d 100644
--- a/tests/Selenium/bootstrap.php
+++ b/tests/Selenium/bootstrap.php
@@ -337,6 +337,11 @@
return $response;
}
+ protected function getText($element)
+ {
+ return $element->text() ?: $element->attribute('textContent');
+ }
+
protected function assertHasClass($classname, $element)
{
$this->assertContains($classname, $element->attribute('class'));
--
Gitblit v1.9.1