summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/FunctionalTests')
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket691.page2
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket703/Logs/LogFile.txt1
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php3
-rwxr-xr-xtests/FunctionalTests/tickets/tests/Ticket703TestCase.php10
-rwxr-xr-xtests/FunctionalTests/tickets/tests/Ticket719TestCase.php17
-rwxr-xr-xtests/FunctionalTests/tickets/tests/Ticket722TestCase.php2
6 files changed, 23 insertions, 12 deletions
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket691.page b/tests/FunctionalTests/tickets/protected/pages/Ticket691.page
index b7942c8e..e5c4d8f7 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket691.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket691.page
@@ -7,7 +7,7 @@
</prop:ClientSide.OnComplete>
</com:TCallbackOptions>
<com:TActiveLabel ID="Title" Text="Cast your vote:" />
-<com:TActiveRatingList ID="List" ActiveControl.CallbackOptions="Parent.RatingOption"
+<com:TActiveRatingList ID="List" ActiveControl.CallbackOptions="Page.RatingOption"
OnCallback="list_oncallback" ActiveControl.EnableUpdate="true">
<com:TListItem Value="1" Text="One star" />
<com:TListItem Value="2" Text="Two stars" />
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Logs/LogFile.txt b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Logs/LogFile.txt
index af19780d..e69de29b 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Logs/LogFile.txt
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Logs/LogFile.txt
@@ -1 +0,0 @@
-Sep 22 20:21:44 [Debug] [Tickets] Test of prado logging system
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php
index 54240798..adf71837 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket703/Ticket703.php
@@ -18,8 +18,7 @@ class Ticket703 extends TPage {
public function clearLog ($sender, $param)
{
$file=prado::getPathOfNameSpace('Ticket703.Logs.LogFile', '.txt');
- $f=fopen($file,"w");
- fclose($f);
+ file_put_contents($file, '');
$this->refreshLog();
}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
index 515bc275..dedb491f 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
@@ -9,12 +9,20 @@ class Ticket703TestCase extends PradoGenericSeleniumTest
// Start with an empty log
$this->click($base.'ctl2');
// Wait for callback to be lanched
- $this->pause(2000);
+ $this->pause(1000);
$this->assertText($base.'logBox', "");
+
$this->type($base.'logMessage', "Test of prado logging system");
$this->click($base.'ctl0');
$this->pause(800);
$this->click($base.'ctl1');
$this->assertTextPresent($base.'logBox', "Test of prado logging system");
+
+ // Clean log for next run
+ $this->click($base.'ctl2');
+ // Wait for callback to be lanched
+ $this->pause(1000);
+ $this->assertText($base.'logBox', "");
+
}
} \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
index e340306a..c71cb0a8 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
@@ -14,14 +14,19 @@ class Ticket719TestCase extends PradoGenericSeleniumTest
$this->assertVisible("${base}ctl0", 'Required');
$this->assertVisible("${base}ctl1", 'Required');
- $this->keyPress("${base}autocomplete", 'f');
- $this->pause(1000);
+ $this->type("${base}autocomplete", 'f');
+ $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})");
+ $this->pause(500);
$this->verifyTextPresent('Finland');
- $this->keyPress("${base}autocomplete", 'r');
- $this->pause(1000);
+
+ $this->type("${base}autocomplete", 'fr');
+ $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})");
+ $this->pause(500);
$this->verifyTextPresent('French');
- $this->keyPress("${base}autocomplete", 'a');
- $this->pause(1000);
+
+ $this->type("${base}autocomplete", 'fra');
+ $this->runScript("Prado.Registry.get('${base}autocomplete').onKeyPress({})");
+ $this->pause(500);
$this->verifyTextPresent('France');
$this->click("css=#${base}autocomplete_result ul li");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
index 62e13526..90711162 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
@@ -18,7 +18,7 @@ class Ticket722TestCase extends PradoGenericSeleniumTest
$this->assertText($base.'InPlaceTextBox__label', 'Prado');
$this->click($base.'ctl0');
$this->pause(800);
- $this->assertText($base.'InPlaceTextBox__label', 'Prado [Read Only]');
+ $this->assertText($base.'InPlaceTextBox__label', 'exact:Prado [Read Only]');
$this->click($base.'InPlaceTextBox__label');
$this->pause(800);
$this->assertNotVisible($base.'InPlaceTextBox');