Skip to content

Commit 8aae03a

Browse files
jimevansjimevans
committed
Merge branch 'master' of https://code.google.com/p/selenium 
2 parents cbc1080 + 2598e06 commit 8aae03a

File tree

236 files changed

+3061
-3646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+3061
-3646
lines changed

‎.idea/libraries/commons_httpclient.xml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ desc "Generate a single file with WebDriverJS' public API"
477477
task :webdriverjs => [ "//javascript/webdriver:webdriver" ]
478478

479479
task :release => [
480-
# :clean,
480+
:clean,
481481
'//java/server/src/org/openqa/selenium/server:server:zip',
482482
'//java/server/src/org/openqa/grid/selenium:selenium:zip',
483483
'//java/client/src/org/openqa/selenium:client-combined:zip',

‎java/client/.classpath‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
1919
<classpathentry kind="lib" path="/third-party/java/opera-driver/operadriver-1.5.jar"/>
2020
<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0-sources.jar"/>
21-
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
22-
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.2.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.2-sources.jar"/>
21+
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
22+
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
2323
<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
2424
<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.4.jar" sourcepath="/third-party/java/commons-io/commons-io-2.4-sources.jar"/>
2525
<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.9.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.9-sources.jar"/>
2626
<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
2727
<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.3.2.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.3.2-sources.jar"/>
28-
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.4-sources.jar"/>
28+
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.6-sources.jar"/>
2929
<classpathentry kind="lib" path="/third-party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="/third-party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
3030
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.14.jar"/>
3131
<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>

‎java/client/src/com/thoughtworks/selenium/webdriven/build.desc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
rename(name = "sizzle",
3+
deps = ["//third_party/js/sizzle:js"],
4+
out = "sizzle.js")
5+
26
java_library(name = "webdriven",
37
srcs = [
48
"ExplodingSupplier.java",
@@ -13,6 +17,7 @@ java_library(name = "webdriven",
1317
embedded = [
1418
"htmlutils.js",
1519
"injectableSelenium.js",
20+
":sizzle",
1621
"//javascript/selenium-atoms:findElement",
1722
"//javascript/selenium-atoms:findOption",
1823
"//javascript/selenium-atoms:fireEvent",
@@ -25,7 +30,6 @@ java_library(name = "webdriven",
2530
"//javascript/selenium-atoms:isTextPresent",
2631
"//javascript/selenium-atoms:isVisible",
2732
"//javascript/selenium-atoms:type",
28-
"//third_party/js/sizzle:sizzle",
2933
])
3034

3135

‎java/client/src/org/openqa/selenium/browserlaunchers/locators/FirefoxLocator.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,22 @@ public String computeLibraryPath(File launcherPath) {
147147
}
148148

149149
public BrowserInstallation findBrowserLocationOrFail() {
150-
final BrowserInstallation firefoxPathLocation = findBrowserLocation();
150+
LOGGER.fine("Discovering Firefox 3...");
151+
final BrowserInstallation firefoxLocation = findBrowserLocation();
152+
if (null != firefoxLocation) {
153+
return firefoxLocation;
154+
}
155+
156+
LOGGER.fine("Did not find Firefox 3, now searching PATH...");
157+
final BrowserInstallation firefoxPathLocation = findBrowserLocationInPath();
151158
if (null != firefoxPathLocation) {
152159
return firefoxPathLocation;
153160
}
154161

155162
throw new RuntimeException(couldNotFindAnyInstallationMessage());
156163
}
157164

158-
public BrowserInstallation findBrowserLocation() {
165+
public BrowserInstallation findBrowserLocationInPath() {
159166
for (String name : standardlauncherFilenames()) {
160167
String executable = CommandLine.find(name);
161168
if (executable == null) {

‎java/client/src/org/openqa/selenium/remote/Augmenter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected RemoteWebDriver extractRemoteWebDriver(WebDriver driver) {
6868
return (RemoteWebDriver) driver;
6969

7070
} else {
71-
logger.warning("Augmenter should be applied to the instances of @Augmentable clases " +
71+
logger.warning("Augmenter should be applied to the instances of @Augmentable classes " +
7272
"or previously augmented instances only");
7373
return null;
7474
}

‎java/client/test/org/openqa/selenium/TypingTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,11 @@ public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() {
710710
@Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, issues = {6711})
711711
@Test
712712
public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet() {
713+
assumeFalse("FIXME: Fails in Firefox on Linux with synthesized events",
714+
isFirefox(driver) &&
715+
!isNativeEventsEnabled(driver) &&
716+
(getEffectivePlatform().is(Platform.LINUX) || getEffectivePlatform().is(Platform.MAC)));
717+
713718
driver.get(pages.richTextPage);
714719

715720
driver.switchTo().frame("editFrame");

‎java/server/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
77
<classpathentry kind="lib" path="/third-party/java/json/json-20080701.jar"/>
88
<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
9-
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
10-
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.2.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.4-sources.jar"/>
9+
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
10+
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
1111
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
1212
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
1313
<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>

‎java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherUtilsUnitTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ private File getNonexistentDestDir() {
114114
return destDir;
115115
}
116116

117-
@Test
118117
public void copyDirectoryCleanUp(File srcDir, File destDir) {
119118
LauncherUtils.deleteTryTryAgain(srcDir, 1);
120119
LauncherUtils.deleteTryTryAgain(destDir, 1);

‎javascript/atoms/action.js‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
/**
2-
* @license
3-
* Copyright 2010 WebDriver committers
4-
* Copyright 2010 Google Inc.
5-
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
17-
*/
1+
// Copyright 2010 WebDriver committers
2+
// Copyright 2010 Google Inc.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
1815

1916
/**
2017
* @fileoverview Atoms for simulating user actions against the DOM.

0 commit comments

Comments
 (0)