From 5a47e8d5c472bfbe07abb464cdcc5bbc721f8d59 Mon Sep 17 00:00:00 2001 From: wei <> Date: Sat, 26 Aug 2006 12:27:37 +0000 Subject: MINOR BC BREAK (javascript related). Update javascript effect library to 1.6.2, unify javascript event handler function signatures. --- .../features/protected/pages/ValidatorEffects.page | 44 +++++++++++----------- .../tickets/protected/pages/Ticket278.page | 18 ++++----- .../tickets/tests/Ticket274TestCase.php | 10 ++--- 3 files changed, 36 insertions(+), 36 deletions(-) (limited to 'tests/FunctionalTests') diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page index 7fca0f56..e01b542e 100644 --- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page +++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page @@ -4,43 +4,43 @@
Create New Account - +
- Username: + Username: - Effect.Shake(validator.control); - Effect.Appear(validator.message); + Effect.Shake(sender.control); + Effect.Appear(sender.message); - Effect.Fade(validator.message); + Effect.Fade(sender.message); - +
Password - -
+ ClientSide.OnError="sender.message.visualEffect('appear')" + ClientSide.OnSuccess="sender.message.visualEffect('fade')" + ErrorMessage="a password is required." /> +
@@ -54,7 +54,7 @@
Login Name: - +
- - Effect.Appear(summary.messages) - Effect.Shake(summary.messages,{ queue: 'end'}) - + Effect.Appear(sender.messages) + Effect.Shake(sender.messages,{ queue: 'end'}) +
- - if(!confirm('<%= Prado::localize("Confirm Delete") %>')) + if(!confirm('<%= Prado::localize("Confirm Delete") %>')) return false; diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page index 75aed4d9..e7341bcc 100644 --- a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page +++ b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page @@ -4,16 +4,16 @@
- -
+ - + - + Event.OnLoad(function() { diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php index ae976a7f..6a5ae0ff 100644 --- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php @@ -9,15 +9,15 @@ class Ticket274TestCase extends SeleniumTestCase $this->assertTitle('Verifying Ticket 274'); $this->assertNotVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); - - $this->click($base.'button1'); + + $this->clickAndWait($base.'button1'); $this->assertVisible($base.'validator1'); $this->assertNotVisible($base.'validator2'); - + $this->type($base.'MyDate', 'asd'); - $this->click($base.'button1'); + $this->clickAndWait($base.'button1'); $this->assertVisible($base.'validator1'); - $this->assertNotVisible($base.'validator2'); + $this->assertNotVisible($base.'validator2'); } } -- cgit v1.2.3