Merge "Revert "Revert "jQuery 1.8"""

[lhc/web/wiklou.git] / tests / selenium / installer / MediaWikiOnAlreadyInstalledTestCase.php

diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
index b7b00ec..7a1b615 100644 (file)
--- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
+++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
@@ -28,10 +28,10 @@
  */
 
 
-require_once( str_replace('//','/',dirname(__FILE__).'/') .'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 
-/*
+/**
  * Test Case ID   : 03 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
  * Test Case Name : Install mediawiki on a already installed Mediawiki.]
  * Version        : MediaWiki 1.18alpha
@@ -56,11 +56,11 @@ class MediaWikiOnAlreadyInstalledTestCase extends MediaWikiInstallationCommonFun
         parent::clickContinueButton();
 
         // 'Install' page should display after the 'Option' page
-        $this->assertEquals( "Install", $this->getText( "//div[@id='bodyContent']/div/div/h2" ));
+        $this->assertEquals( "Install", $this->getText( LINK_DIV."h2" ));
 
         // Verify warning text displayed
         $this->assertEquals( "Warning: You seem to have already installed MediaWiki and are trying to install it again. Please proceed to the next page.",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/form/div[1]/div[2]" ));
+                $this->getText( LINK_FORM."div[1]/div[2]" ));
 
         // Complete page
         parent::clickContinueButton();