Permalink
Browse files

Deleting native evens from firefox driver

  • Loading branch information...
1 parent 2277e99 commit 73cffa2241b255be30c77a587305e7aa83ef58ae @barancev barancev committed Sep 16, 2015
@@ -40,6 +40,7 @@
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
+import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
import static org.openqa.selenium.testing.Ignore.Driver.IE;
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
@@ -382,7 +383,7 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal
// Note: If this test ever fixed/enabled on Firefox, check if it also needs @NoDriverAfterTest OR
// if @NoDriverAfterTest can be removed from some other tests in this class.
- @Ignore(value = {HTMLUNIT, SAFARI, PHANTOMJS},
+ @Ignore(value = {HTMLUNIT, SAFARI, PHANTOMJS, FIREFOX},
reason = "Safari: see issue 687, comment 41; PHANTOMJS: not tested", issues = {687})
@NeedsLocalEnvironment
@NoDriverAfterTest
@@ -29,21 +29,9 @@ mozilla_extension(name = 'webdriver',
':session-store',
':status-xpt',
':synthetic-mouse',
- '//cpp/webdriver-firefox:native-events-xpt',
- '//cpp/webdriver-firefox:native-mouse-xpt',
- '//cpp/webdriver-firefox:native-keyboard-xpt',
- '//cpp/webdriver-firefox:native-ime-xpt',
],
platforms = [
':winnt-x86-msvc',
-# { '//cpp:webdriver_firefox_esr_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so' },
-# { '//cpp:webdriver_firefox_esr_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so' },
-# { '//cpp:webdriver_firefox_esr_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so' },
-# { '//cpp:webdriver_firefox_esr_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so' },
-# { '//cpp:webdriver_firefox_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so' },
-# { '//cpp:webdriver_firefox_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so' },
-# { '//cpp:webdriver_firefox_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so' },
-# { '//cpp:webdriver_firefox_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so' },
],
resources = [
':js-resources',
@@ -86,10 +74,6 @@ folder(name = 'win-components',
out = 'components',
srcs = [
'//cpp/prebuilt:imehandler-dll',
- '//cpp/webdriver-firefox:previous-esr',
- '//cpp/webdriver-firefox:latest-esr',
- '//cpp/webdriver-firefox:previous',
- '//cpp/webdriver-firefox:latest',
],
)
@@ -44,22 +44,7 @@ mozilla_extension(name = "webdriver",
":synthetic-mouse",
],
resources = [
- { "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
- { "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
- { "../../cpp/prebuilt/Win32/Release/webdriver-firefox-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
- { "../../cpp/prebuilt/Win32/Release/webdriver-firefox-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
{ "../../cpp/prebuilt/Win32/Release/imehandler.dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" },
- { "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },
- { "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so" },
- { "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so" },
- { "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so" },
- { "../../cpp/prebuilt/i386/libwebdriver_firefox_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so" },
- { "../../cpp/prebuilt/i386/libwebdriver_firefox_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so" },
- { "../../cpp/prebuilt/amd64/libwebdriver_firefox_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so" },
- { "../../cpp/prebuilt/amd64/libwebdriver_firefox_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so" },
- { "../../cpp/prebuilt/nsINativeEvents.xpt" : "components/nsINativeEvents.xpt" },
- { "../../cpp/prebuilt/nsINativeMouse.xpt" : "components/nsINativeMouse.xpt" },
- { "../../cpp/prebuilt/nsINativeKeyboard.xpt" : "components/nsINativeKeyboard.xpt" },
{ "../../cpp/prebuilt/nsINativeIME.xpt" : "components/nsINativeIME.xpt" },
{ ":web-element-cache" : "resource/modules/web-element-cache.js" },
{ "js/timer.js" : "resource/modules/timer.js" },
@@ -1,4 +1,4 @@
-resource fxdriver resource/
+resource fxdriver resource/
content fxdriver content/
@@ -7,14 +7,11 @@ overlay chrome://browser/content/browser.xul chrome://fxdriver/content/fx4driver
interfaces components/nsICommandProcessor.xpt
interfaces components/nsIHttpServer.xpt
-interfaces components/nsINativeEvents.xpt
interfaces components/nsIResponseHandler.xpt
interfaces components/wdICoordinate.xpt
interfaces components/wdIModifierKeys.xpt
interfaces components/wdIMouse.xpt
interfaces components/wdIStatus.xpt
-interfaces components/nsINativeMouse.xpt
-interfaces components/nsINativeKeyboard.xpt
interfaces components/nsINativeIME.xpt
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
contract @googlecode.com/webdriver/syntheticmouse;1 {E8F9FEFE-C513-4097-98BE-BE00A41D3645}
-binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll ABI=WINNT_x86-msvc appversion>=34
-binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll ABI=WINNT_x86-msvc appversion>=33 platformversion<34
-binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll ABI=WINNT_x86-msvc appversion>=31 platformversion<32
-binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll ABI=WINNT_x86-msvc appversion>=24 platformversion<25
-
binary-component platform/WINNT_x86-msvc/components/imehandler.dll ABI=WINNT_x86-msvc
-
-binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86_64-gcc3 appversion>=34
-binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86_64-gcc3 appversion>=33 platformversion<34
-binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86_64-gcc3 appversion>=31 platformversion<32
-binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86_64-gcc3 appversion>=24 platformversion<25
-
-binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86-gcc3 appversion>=34
-binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86-gcc3 appversion>=33 platformversion<34
-binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86-gcc3 appversion>=31 platformversion<32
-binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86-gcc3 appversion>=24 platformversion<25
@@ -15,17 +15,14 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion>
- <em:maxVersion>43.0</em:maxVersion>
+ <em:maxVersion>45.0</em:maxVersion>
</Description>
</em:targetApplication>
- <!-- Platforms where we're not compiling the native events -->
<em:targetPlatform>Darwin</em:targetPlatform>
<em:targetPlatform>SunOS</em:targetPlatform>
<em:targetPlatform>FreeBSD</em:targetPlatform>
<em:targetPlatform>OpenBSD</em:targetPlatform>
-
- <!-- Platforms where we are -->
<em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>
<em:targetPlatform>Linux</em:targetPlatform>
@@ -27,8 +27,6 @@ var EXPORTED_SYMBOLS = [
'bot',
'fxdriver',
'goog',
- 'notifyOfCloseWindow',
- 'notifyOfSwitchToWindow',
'webdriver'
];
Oops, something went wrong.

0 comments on commit 73cffa2

Please sign in to comment.