summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests/features
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-03-05 23:02:18 +0100
committerDavid <ottodavid@gmx.net>2014-08-21 17:30:13 +0200
commit94e54d3023ed89281f89125f3ad0553afb9312cb (patch)
tree688470329e8b837252b523b6341fe5e10fe34b95 /tests/FunctionalTests/features
parent32dfd8233520261483bdf30f23425e3b50f05d17 (diff)
Started cleaning tests' selenium2 compatibility layer
(cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790) Conflicts: tests/FunctionalTests/tickets/tests/Ticket220TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php tests/FunctionalTests/tickets/tests/Ticket769TestCase.php tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php tests/FunctionalTests/validators/tests/DatePickerTestCase.php
Diffstat (limited to 'tests/FunctionalTests/features')
-rwxr-xr-xtests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php14
-rwxr-xr-xtests/FunctionalTests/features/tests/MyTestCase.php2
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
index 49a5db93..5292affb 100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
@@ -32,13 +32,13 @@ class BasicI18NTestCase extends PradoGenericSelenium2Test
function testI18N()
{
- $this->verifyTitle("Basic I18N Test", "");
- $this->assertTextPresent("Hello", "");
- $this->assertTextPresent("US$10,000.00", "");
- $this->assertTextPresent("2006年1月15日 上午12时00分00秒", "");
- $this->assertTextPresent("None", "");
- $this->assertTextPresent("One thing.", "");
- $this->assertTextPresent("Many things.", "");
+ $this->assertEquals("Basic I18N Test", $this->title());
+ $this->assertContains("Hello", $this->source());
+ $this->assertContains("US$10,000.00", $this->source());
+ $this->assertContains("2006年1月15日 上午12时00分00秒", $this->source());
+ $this->assertContains("None", $this->source());
+ $this->assertContains("One thing.", $this->source());
+ $this->assertContains("Many things.", $this->source());
}
}
*/ \ No newline at end of file
diff --git a/tests/FunctionalTests/features/tests/MyTestCase.php b/tests/FunctionalTests/features/tests/MyTestCase.php
index 682462fe..d748b6b0 100755
--- a/tests/FunctionalTests/features/tests/MyTestCase.php
+++ b/tests/FunctionalTests/features/tests/MyTestCase.php
@@ -5,6 +5,6 @@ class MyTestCase extends PradoGenericSelenium2Test
function test1()
{
$this->url('http://127.0.0.1');
- $this->assertTextNotPresent('asd');
+ $this->assertNotContains('asd', $this->source());
}
}