From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 1 Jun 2010 16:31:56 +0000 (+0000)
Subject: svn:eol-style native
X-Git-Tag: 1.31.0-rc.0~36646
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=9822ba5bf91a022db279ec6ed43766bfc3727b42;p=lhc%2Fweb%2Fwiklou.git

svn:eol-style native
---

diff --git a/maintenance/tests/selenium/LocalSeleniumSettings.php.sample b/maintenance/tests/selenium/LocalSeleniumSettings.php.sample
index a4dfeeaeba..86606e6ff9 100644
--- a/maintenance/tests/selenium/LocalSeleniumSettings.php.sample
+++ b/maintenance/tests/selenium/LocalSeleniumSettings.php.sample
@@ -1,51 +1,51 @@
-<?php
-// This template file contains variables that should be localized.
-// The line (specifying the location of the PHP/PEAR libraries) must be
-// first. Moving it to a position later in the file will almost certainly
-// cause an error.
-
-// In order to use this file, first copy it to LocalSeleniumSettings.php.
-// Then edit the information to conform to the local environment. You
-// will almost certainly have to uncomment the line set_include_path ... and
-// change the string 'PEAR' to the path to your PEAR library, e.g.,
-// '/usr/share/php/PEAR' for a Debian based Linux system.
-// The edited file must appear in the same directory as does RunSeleniumTests.php.
-
-// include path. Set 'PEAR" to '/path/to/PEAR/library'
-
-// URL: http://localhost/tests/RunSeleniumTests.php
-#set_include_path( get_include_path() . PATH_SEPARATOR . 'PEAR' );
-
-// Hostname of selenium server
-$wgSeleniumTestsSeleniumHost = 'localhost';
-
-// URL of the wiki to be tested. Consult web server configuration.
-$wgSeleniumTestsWikiUrl = 'http://localhost';
-
-// Port used by selenium server (optional - default is 4444)
-$wgSeleniumServerPort = 4444;
-
-// Wiki login. Used by Selenium to log onto the wiki
-$wgSeleniumTestsWikiUser      = 'Wikisysop';
-$wgSeleniumTestsWikiPassword  = 'password';
-
-// Common browsers on Windows platform. Modify for other platforms or
-// other Windows browsers
-// Use the *chrome handler in order to be able to test file uploads
-// further solution suggestions: http://www.brokenbuild.com/blog/2007/06/07/testing-file-uploads-with-selenium-rc-and-firefoxor-reducing-javascript-security-in-firefox-for-fun-and-profit/
-// $wgSeleniumTestsBrowsers['firefox']   = '*firefox c:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe';
-$wgSeleniumTestsBrowsers['firefox']   = '*firefox /usr/bin/firefox';
-$wgSeleniumTestsBrowsers['iexplorer'] = '*iexploreproxy';
-$wgSeleniumTestsBrowsers['opera']   = '*chrome /usr/bin/opera';
-
-// Actually, use this browser
-$wgSeleniumTestsUseBrowser = 'firefox';
-
-// Set command line mode
-$wgSeleniumTestsRunMode = 'cli';
-
-// List of tests to be included by default
-$wgSeleniumTestIncludes = array(
-	'selenium/SimpleSeleniumTest.php'
-);
+<?php
+// This template file contains variables that should be localized.
+// The line (specifying the location of the PHP/PEAR libraries) must be
+// first. Moving it to a position later in the file will almost certainly
+// cause an error.
+
+// In order to use this file, first copy it to LocalSeleniumSettings.php.
+// Then edit the information to conform to the local environment. You
+// will almost certainly have to uncomment the line set_include_path ... and
+// change the string 'PEAR' to the path to your PEAR library, e.g.,
+// '/usr/share/php/PEAR' for a Debian based Linux system.
+// The edited file must appear in the same directory as does RunSeleniumTests.php.
+
+// include path. Set 'PEAR" to '/path/to/PEAR/library'
+
+// URL: http://localhost/tests/RunSeleniumTests.php
+#set_include_path( get_include_path() . PATH_SEPARATOR . 'PEAR' );
+
+// Hostname of selenium server
+$wgSeleniumTestsSeleniumHost = 'localhost';
+
+// URL of the wiki to be tested. Consult web server configuration.
+$wgSeleniumTestsWikiUrl = 'http://localhost';
+
+// Port used by selenium server (optional - default is 4444)
+$wgSeleniumServerPort = 4444;
+
+// Wiki login. Used by Selenium to log onto the wiki
+$wgSeleniumTestsWikiUser      = 'Wikisysop';
+$wgSeleniumTestsWikiPassword  = 'password';
+
+// Common browsers on Windows platform. Modify for other platforms or
+// other Windows browsers
+// Use the *chrome handler in order to be able to test file uploads
+// further solution suggestions: http://www.brokenbuild.com/blog/2007/06/07/testing-file-uploads-with-selenium-rc-and-firefoxor-reducing-javascript-security-in-firefox-for-fun-and-profit/
+// $wgSeleniumTestsBrowsers['firefox']   = '*firefox c:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe';
+$wgSeleniumTestsBrowsers['firefox']   = '*firefox /usr/bin/firefox';
+$wgSeleniumTestsBrowsers['iexplorer'] = '*iexploreproxy';
+$wgSeleniumTestsBrowsers['opera']   = '*chrome /usr/bin/opera';
+
+// Actually, use this browser
+$wgSeleniumTestsUseBrowser = 'firefox';
+
+// Set command line mode
+$wgSeleniumTestsRunMode = 'cli';
+
+// List of tests to be included by default
+$wgSeleniumTestIncludes = array(
+	'selenium/SimpleSeleniumTest.php'
+);
 ?>
\ No newline at end of file
diff --git a/maintenance/tests/selenium/SimpleSeleniumTest.php b/maintenance/tests/selenium/SimpleSeleniumTest.php
index c002ecfe8f..aaf276b4e3 100644
--- a/maintenance/tests/selenium/SimpleSeleniumTest.php
+++ b/maintenance/tests/selenium/SimpleSeleniumTest.php
@@ -1,31 +1,31 @@
-<?php
-
-if (!defined('MEDIAWIKI') || !defined('SELENIUMTEST')) {
-	echo "This script cannot be run standalone";
-	exit(1);
-}
-
-// create test suite
-$wgSeleniumTestSuites['SimpleSeleniumTest'] = new SeleniumTestSuite('Simple Selenium Test');
-$wgSeleniumTestSuites['SimpleSeleniumTest']->addTest(new SimpleSeleniumTest());
-
-class SimpleSeleniumTest extends SeleniumTestCase
-{
-	public $name = "Basic selenium test";
-
-	public function runTest()
-	{
-		global $wgSeleniumTestsWikiUrl;
-		$this->open($wgSeleniumTestsWikiUrl.'/index.php?title=Selenium&action=edit');
-		$this->type("wpTextbox1", "This is a basic test");
-		$this->click("wpPreview");
-		$this->waitForPageToLoad(10000);
-
-		// check result
-		$source = $this->getText("//div[@id='wikiPreview']/p");
-		$correct = strstr($source, "This is a basic test");
-		$this->assertEquals($correct, true);
-
-	}
-
+<?php
+
+if (!defined('MEDIAWIKI') || !defined('SELENIUMTEST')) {
+	echo "This script cannot be run standalone";
+	exit(1);
+}
+
+// create test suite
+$wgSeleniumTestSuites['SimpleSeleniumTest'] = new SeleniumTestSuite('Simple Selenium Test');
+$wgSeleniumTestSuites['SimpleSeleniumTest']->addTest(new SimpleSeleniumTest());
+
+class SimpleSeleniumTest extends SeleniumTestCase
+{
+	public $name = "Basic selenium test";
+
+	public function runTest()
+	{
+		global $wgSeleniumTestsWikiUrl;
+		$this->open($wgSeleniumTestsWikiUrl.'/index.php?title=Selenium&action=edit');
+		$this->type("wpTextbox1", "This is a basic test");
+		$this->click("wpPreview");
+		$this->waitForPageToLoad(10000);
+
+		// check result
+		$source = $this->getText("//div[@id='wikiPreview']/p");
+		$correct = strstr($source, "This is a basic test");
+		$this->assertEquals($correct, true);
+
+	}
+
 }
\ No newline at end of file