summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests
diff options
context:
space:
mode:
authorJean-Luc Gyger <jean-luc.gyger@vysual.ch>2016-02-11 10:01:12 +0100
committerJean-Luc Gyger <jean-luc.gyger@vysual.ch>2016-02-11 10:01:12 +0100
commitd70861a8f9368773f2f0291454e9420174e6c14a (patch)
treee44a32e401211422fb05da355c9eef4d5934d9e9 /tests/FunctionalTests
parentd32f65815eb6feb4bcb8a0c85572f722d7826342 (diff)
parent275f16b90a92c62935cb691d11e0bd124acf64e4 (diff)
Merge branch 'master' of https://github.com/majuca/prado
Diffstat (limited to 'tests/FunctionalTests')
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.php4
-rwxr-xr-xtests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php2
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/protected/pages/Issue516.page0
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/protected/pages/Issue516.php0
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/tests/Issue516TestCase.php0
-rwxr-xr-xtests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php2
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Layout.php9
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket121.page2
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.php2
-rwxr-xr-xtests/FunctionalTests/tickets/tests/Ticket595TestCase.php4
-rwxr-xr-xtests/FunctionalTests/validators/protected/pages/ImageButton.page6
12 files changed, 13 insertions, 20 deletions
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
index 9b149b45..b2aefc3b 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
@@ -2,7 +2,7 @@
<h1>Active HyperLink Test Case</h1>
<div style="margin:1em; padding:1em; border:1px solid #ccc; text-align:center;">
- <com:TActiveHyperLink ID="link1" Text="Link 1" NavigateUrl="http://www.pradosoft.com" />
+ <com:TActiveHyperLink ID="link1" Text="Link 1" NavigateUrl="https://github.com/pradosoft/prado" />
</div>
<com:TActiveButton ID="button1" Text="Change Text" OnClick="change_text" />
<com:TActiveButton ID="button2" Text="Change Image" OnClick="change_image" />
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.php b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.php
index ef3f597e..5ccf2e70 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.php
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.php
@@ -4,7 +4,7 @@ class ActiveHyperLinkTest extends TPage
{
function change_text()
{
- $this->link1->Text = "Pradosoft.com";
+ $this->link1->Text = "Prado framework";
}
function change_image()
@@ -19,6 +19,6 @@ class ActiveHyperLinkTest extends TPage
function change_url()
{
- $this->link1->NavigateUrl = "http://www.xlab6.com";
+ $this->link1->NavigateUrl = "http://www.google.com";
}
}
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php
index f6117b9d..4f8d5730 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveHyperLinkTestCase.php
@@ -12,6 +12,6 @@ class ActiveHyperLinkTestCase extends PradoGenericSelenium2Test
$this->byId("{$base}button1")->click();
$this->pause(800);
- $this->assertText("{$base}link1", "Pradosoft.com");
+ $this->assertText("{$base}link1", "Prado framework");
}
}
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.page b/tests/FunctionalTests/issues/protected/pages/Issue516.page
index c922c6e1..c922c6e1 100644..100755
--- a/tests/FunctionalTests/issues/protected/pages/Issue516.page
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.page
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.php b/tests/FunctionalTests/issues/protected/pages/Issue516.php
index bd3e7a72..bd3e7a72 100644..100755
--- a/tests/FunctionalTests/issues/protected/pages/Issue516.php
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.php
diff --git a/tests/FunctionalTests/issues/tests/Issue516TestCase.php b/tests/FunctionalTests/issues/tests/Issue516TestCase.php
index 2b221081..2b221081 100644..100755
--- a/tests/FunctionalTests/issues/tests/Issue516TestCase.php
+++ b/tests/FunctionalTests/issues/tests/Issue516TestCase.php
diff --git a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
index 9fdb78bf..1fcb2744 100755
--- a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
@@ -6,7 +6,7 @@ class QuickstartHyperLinkTestCase extends PradoGenericSelenium2Test
{
$this->url("../../demos/quickstart/index.php?page=Controls.Samples.THyperLink.Home&amp;notheme=true&amp;lang=en");
$this->assertEquals("PRADO QuickStart Sample", $this->title());
- $this->assertElementPresent("//a[@href=\"http://www.pradosoft.com/\" and @target=\"_blank\"]");
+ $this->assertElementPresent("//a[@href=\"https://github.com/pradosoft/prado/\" and @target=\"_blank\"]");
$this->assertSourceContains("Welcome to");
$this->assertSourceContains("Body contents");
$this->assertElementPresent("//a[img/@alt='Hello World']");
diff --git a/tests/FunctionalTests/tickets/protected/pages/Layout.php b/tests/FunctionalTests/tickets/protected/pages/Layout.php
index c92cd9c0..7f3ee506 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Layout.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Layout.php
@@ -10,13 +10,6 @@ class Layout extends TTemplateControl
$this->getPage()->setTitle("Verifying $type $num");
$this->ticketlink->setText("Verifying $type $num");
- //TODO New issues will link to https://github.com/pradosoft/prado/issues/{$num}
- if(strToLower($type) === 'issue') {
- $this->ticketlink->setNavigateUrl("http://code.google.com/p/prado3/issues/detail?id={$num}");
- }
- else {
- $this->ticketlink->setNavigateUrl("http://trac.pradosoft.com/prado/ticket/{$num}");
- }
-
+ $this->ticketlink->setNavigateUrl("https://github.com/pradosoft/prado/issues/{$num}");
}
}
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket121.page b/tests/FunctionalTests/tickets/protected/pages/Ticket121.page
index 9c9633d3..ce17726d 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket121.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket121.page
@@ -1,7 +1,7 @@
<com:TContent ID="Content">
<com:TImageButton
- ImageUrl="http://www.pradosoft.com/images/powered.gif"
+ ImageUrl="http://pradosoft.github.io/docs/powered.gif"
Text="Foo"
ValidationGroup="Foo"
OnClick="buttonClicked" />
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.php b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.php
index 9af5b134..051c39db 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.php
@@ -6,6 +6,6 @@ class Layout extends TTemplateControl
{
$this->getPage()->setTitle("Verifying Ticket 653");
$this->ticketlink->setText("Verifying Ticket 653");
- $this->ticketlink->setNavigateUrl("http://trac.pradosoft.com/prado/ticket/653");
+ $this->ticketlink->setNavigateUrl("#");
}
}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
index 27d57a91..381f0d6e 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
@@ -15,7 +15,7 @@ class Ticket595TestCase extends PradoGenericSelenium2Test
$this->byId($base.'ctl2')->click();
$this->assertAttribute($base.'A@class','errorclassA');
- $this->type($base.'A', 'test@pradosoft.com');
+ $this->type($base.'A', 'test@prado.local');
$this->byId($base.'ctl2')->click();
$this->pause(800);
$this->assertAttribute($base.'A@class','');
@@ -29,7 +29,7 @@ class Ticket595TestCase extends PradoGenericSelenium2Test
$this->pause(800);
$this->assertAttribute($base.'B@class',' errorclassB');
- $this->type($base.'B', 'test@pradosoft.com');
+ $this->type($base.'B', 'test@prado.local');
$this->byId($base.'ctl5')->click();
$this->pause(800);
$this->assertAttribute($base.'B@class','');
diff --git a/tests/FunctionalTests/validators/protected/pages/ImageButton.page b/tests/FunctionalTests/validators/protected/pages/ImageButton.page
index d1fae361..9aa6a375 100755
--- a/tests/FunctionalTests/validators/protected/pages/ImageButton.page
+++ b/tests/FunctionalTests/validators/protected/pages/ImageButton.page
@@ -6,7 +6,7 @@
Text="Textbox1 required"
ControlToValidate="TextBox1"
ValidationGroup="Group1" />
-<com:TImageButton ImageUrl="http://www.pradosoft.com/images/powered.gif"
+<com:TImageButton ImageUrl="http://pradosoft.github.io/docs/powered.gif"
ValidationGroup="Group1"
OnClick="button1Clicked" />
<com:TLabel ID="Result1" />
@@ -17,7 +17,7 @@
<com:TRequiredFieldValidator
Text="Textbox2 required"
ControlToValidate="TextBox2" />
-<com:TImageButton ImageUrl="http://www.pradosoft.com/images/powered.gif"
+<com:TImageButton ImageUrl="http://pradosoft.github.io/docs/powered.gif"
OnClick="button2Clicked" />
<com:TLabel ID="Result2" />
@@ -29,7 +29,7 @@
EnableClientScript="false"
ControlToValidate="TextBox3"
ValidationGroup="Group3" />
-<com:TImageButton ImageUrl="http://www.pradosoft.com/images/powered.gif"
+<com:TImageButton ImageUrl="http://pradosoft.github.io/docs/powered.gif"
ValidationGroup="Group3"
OnClick="button3Clicked" />
<com:TLabel ID="Result3" />