Merge branch 'master' of https://github.com/majuca/prado

4 files changed, 5 insertions, 12 deletions

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','');