Skip to content

Commit 73cffa2

Browse files
barancevbarancev
committed
Deleting native evens from firefox driver
1 parent 2277e99 commit 73cffa2

File tree

13 files changed

+37
-581
lines changed

13 files changed

+37
-581
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
4141
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
4242
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
43+
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
4344
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
4445
import static org.openqa.selenium.testing.Ignore.Driver.IE;
4546
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
@@ -382,7 +383,7 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal
382383

383384
// Note: If this test ever fixed/enabled on Firefox, check if it also needs @NoDriverAfterTest OR
384385
// if @NoDriverAfterTest can be removed from some other tests in this class.
385-
@Ignore(value = {HTMLUNIT, SAFARI, PHANTOMJS},
386+
@Ignore(value = {HTMLUNIT, SAFARI, PHANTOMJS, FIREFOX},
386387
reason = "Safari: see issue 687, comment 41; PHANTOMJS: not tested", issues = {687})
387388
@NeedsLocalEnvironment
388389
@NoDriverAfterTest

‎javascript/firefox-driver/BUCK

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,9 @@ mozilla_extension(name = 'webdriver',
2929
':session-store',
3030
':status-xpt',
3131
':synthetic-mouse',
32-
'//cpp/webdriver-firefox:native-events-xpt',
33-
'//cpp/webdriver-firefox:native-mouse-xpt',
34-
'//cpp/webdriver-firefox:native-keyboard-xpt',
35-
'//cpp/webdriver-firefox:native-ime-xpt',
3632
],
3733
platforms = [
3834
':winnt-x86-msvc',
39-
# { '//cpp:webdriver_firefox_esr_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so' },
40-
# { '//cpp:webdriver_firefox_esr_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so' },
41-
# { '//cpp:webdriver_firefox_esr_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so' },
42-
# { '//cpp:webdriver_firefox_esr_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so' },
43-
# { '//cpp:webdriver_firefox_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so' },
44-
# { '//cpp:webdriver_firefox_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so' },
45-
# { '//cpp:webdriver_firefox_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so' },
46-
# { '//cpp:webdriver_firefox_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so' },
4735
],
4836
resources = [
4937
':js-resources',
@@ -86,10 +74,6 @@ folder(name = 'win-components',
8674
out = 'components',
8775
srcs = [
8876
'//cpp/prebuilt:imehandler-dll',
89-
'//cpp/webdriver-firefox:previous-esr',
90-
'//cpp/webdriver-firefox:latest-esr',
91-
'//cpp/webdriver-firefox:previous',
92-
'//cpp/webdriver-firefox:latest',
9377
],
9478
)
9579

‎javascript/firefox-driver/build.desc

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,7 @@ mozilla_extension(name = "webdriver",
4444
":synthetic-mouse",
4545
],
4646
resources = [
47-
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
48-
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
49-
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
50-
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
5147
{ "../../cpp/prebuilt/Win32/Release/imehandler.dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" },
52-
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },
53-
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so" },
54-
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so" },
55-
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so" },
56-
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so" },
57-
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so" },
58-
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so" },
59-
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so" },
60-
{ "../../cpp/prebuilt/nsINativeEvents.xpt" : "components/nsINativeEvents.xpt" },
61-
{ "../../cpp/prebuilt/nsINativeMouse.xpt" : "components/nsINativeMouse.xpt" },
62-
{ "../../cpp/prebuilt/nsINativeKeyboard.xpt" : "components/nsINativeKeyboard.xpt" },
6348
{ "../../cpp/prebuilt/nsINativeIME.xpt" : "components/nsINativeIME.xpt" },
6449
{ ":web-element-cache" : "resource/modules/web-element-cache.js" },
6550
{ "js/timer.js" : "resource/modules/timer.js" },

‎javascript/firefox-driver/extension/chrome.manifest

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resource fxdriver resource/
1+
resource fxdriver resource/
22

33
content fxdriver content/
44

@@ -7,14 +7,11 @@ overlay chrome://browser/content/browser.xul chrome://fxdriver/content/fx4driver
77

88
interfaces components/nsICommandProcessor.xpt
99
interfaces components/nsIHttpServer.xpt
10-
interfaces components/nsINativeEvents.xpt
1110
interfaces components/nsIResponseHandler.xpt
1211
interfaces components/wdICoordinate.xpt
1312
interfaces components/wdIModifierKeys.xpt
1413
interfaces components/wdIMouse.xpt
1514
interfaces components/wdIStatus.xpt
16-
interfaces components/nsINativeMouse.xpt
17-
interfaces components/nsINativeKeyboard.xpt
1815
interfaces components/nsINativeIME.xpt
1916

2017
component {c8fffaba-9b7a-41aa-872d-7e7366c16715} components/bad-cert-listener.js
@@ -47,19 +44,4 @@ contract @googlecode.com/webdriver/modifierkeys;1 {2E4B69B9-21FE-48ad-A2F6-AB355
4744

4845
contract @googlecode.com/webdriver/syntheticmouse;1 {E8F9FEFE-C513-4097-98BE-BE00A41D3645}
4946

50-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll ABI=WINNT_x86-msvc appversion>=34
51-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll ABI=WINNT_x86-msvc appversion>=33 platformversion<34
52-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll ABI=WINNT_x86-msvc appversion>=31 platformversion<32
53-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll ABI=WINNT_x86-msvc appversion>=24 platformversion<25
54-
5547
binary-component platform/WINNT_x86-msvc/components/imehandler.dll ABI=WINNT_x86-msvc
56-
57-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86_64-gcc3 appversion>=34
58-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86_64-gcc3 appversion>=33 platformversion<34
59-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86_64-gcc3 appversion>=31 platformversion<32
60-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86_64-gcc3 appversion>=24 platformversion<25
61-
62-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86-gcc3 appversion>=34
63-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86-gcc3 appversion>=33 platformversion<34
64-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86-gcc3 appversion>=31 platformversion<32
65-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86-gcc3 appversion>=24 platformversion<25

‎javascript/firefox-driver/extension/install.rdf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@
1515
<Description>
1616
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
1717
<em:minVersion>3.0</em:minVersion>
18-
<em:maxVersion>43.0</em:maxVersion>
18+
<em:maxVersion>45.0</em:maxVersion>
1919
</Description>
2020
</em:targetApplication>
2121

22-
<!-- Platforms where we're not compiling the native events -->
2322
<em:targetPlatform>Darwin</em:targetPlatform>
2423
<em:targetPlatform>SunOS</em:targetPlatform>
2524
<em:targetPlatform>FreeBSD</em:targetPlatform>
2625
<em:targetPlatform>OpenBSD</em:targetPlatform>
27-
28-
<!-- Platforms where we are -->
2926
<em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>
3027
<em:targetPlatform>Linux</em:targetPlatform>
3128

‎javascript/firefox-driver/js/exported_symbols.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ var EXPORTED_SYMBOLS = [
2727
'bot',
2828
'fxdriver',
2929
'goog',
30-
'notifyOfCloseWindow',
31-
'notifyOfSwitchToWindow',
3230
'webdriver'
3331
];
3432

0 commit comments

Comments
 (0)