Skip to content

Commit

Permalink
The SafariDriver now lives in the safari branch
Browse files Browse the repository at this point in the history 
master contains only the library needed by clients to establish a
connection with the driver.
  • Loading branch information
@jleyba
jleyba committed May 16, 2016
1 parent f73c7c1 commit a793d61
Show file tree
Hide file tree
Showing 60 changed files with 49 additions and 8,843 deletions.
32 changes: 1 addition & 31 deletions Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ task :remote_common => ["//java/client/src/org/openqa/selenium/remote:common"]
task :remote_client => ["//java/client/src/org/openqa/selenium/remote"]
task :remote_server => ["//java/server/src/org/openqa/selenium/remote/server"]
task :safari => [
"//javascript/safari-driver:SafariDriver",
"//java/client/src/org/openqa/selenium/safari",
]
task :server_lite => ["//java/server/src/org/openqa/selenium/server:server_lite"]
Expand Down Expand Up @@ -601,39 +600,10 @@ namespace :node do
end

namespace :safari do
desc "Build the SafariDriver extension"
task :extension => [ "//javascript/safari-driver:SafariDriver" ]

desc "Build the SafariDriver extension and java client"
desc "Build the SafariDriver java client"
task :build => [
:extension,
"//java/client/src/org/openqa/selenium/safari"
]

desc "Run JavaScript tests for Safari"
task :testjs => [
"//javascript/atoms:test_safari:run",
"//javascript/safari-driver:test:run",
"//javascript/selenium-atoms:test_safari:run",
"//javascript/webdriver:test_safari:run"
]

desc "Run Java tests for Safari"
task :testjava => [
"//java/client/test/org/openqa/selenium/safari:test:run"
]

desc "Run all SafariDriver tests"
task :test => [
"safari:testjs",
"safari:testjava"
]

desc "Re-install the SafariDriver extension; OSX only"
task :reinstall => [ :extension ] do |t|
raise StandardError, "Task #{t.name} is only available on OSX" unless mac?
sh "osascript javascript/safari-driver/reinstall.scpt"
end
end

namespace :marionette do
Expand Down
215 changes: 2 additions & 213 deletions javascript/safari-driver/BUCK
View file
Original file line number Diff line number Diff line change
@@ -1,220 +1,9 @@
js_library(name = 'common',
srcs = [
'alert.js',
'console.js',
'logging.js',
'tab.js',
],
deps = [
'//javascript/atoms:errors',
'//javascript/safari-driver/message:message',
'//third_party/closure:closure',
],
)

js_library(name = 'command',
srcs = [
'command.js',
'dom.js',
],
deps = [
'//javascript/atoms:json',
'//javascript/webdriver:base',
],
visibility = [
'//javascript/safari-driver/...',
],
)

# Binary that may be used by a language binding to establish a connection
# with the driver when loaded in the browser.
js_binary(name = 'client',
srcs = [
'client.js',
'deps.js',
],
deps = [
':common',
'//javascript/safari-driver/message:message',
'//third_party/closure:closure',
],
externs = [
'externs/common.js',
'externs/webcontent.js',
],
srcs = ['client.js'],
flags = [
'--define=goog.userAgent.ASSUME_WEBKIT=true',
'--define=goog.userAgent.product.ASSUME_SAFARI=true',
'--define=safaridriver.message.FORCE_SYNCHRONOUS_PROXY_SEND=true',

'--jscomp_error=accessControls',
'--jscomp_error=ambiguousFunctionDecl',
'--jscomp_error=checkRegExp',
'--jscomp_error=checkVars',
'--jscomp_error=constantProperty',
'--jscomp_error=deprecated',
'--jscomp_error=duplicateMessage',
'--jscomp_error=es5Strict',
'--jscomp_error=externsValidation',
'--jscomp_error=fileoverviewTags',
'--jscomp_error=globalThis',
'--jscomp_error=invalidCasts',
'--jscomp_error=missingProperties',
'--jscomp_error=nonStandardJsDocs',
'--jscomp_error=strictModuleDepCheck',
'--jscomp_error=typeInvalidation',
'--jscomp_error=undefinedVars',
'--jscomp_error=unknownDefines',
'--jscomp_error=uselessCode',
'--jscomp_error=visibility',

'--jscomp_warning=checkTypes',

'--language_in=ECMASCRIPT6_STRICT',
'--language_out=ECMASCRIPT5_STRICT',

"--output_wrapper='%output%;window.onload = init;'",
'--third_party=false',
'--compilation_level=WHITESPACE_ONLY',
],
visibility = [
'//java/client/src/org/openqa/selenium/safari:client',
],
)

# Binary for the debug/logging window.
js_binary(
name = 'debug',
srcs = [
'deps.js',
'debug/debug.js',
],
defines = [
'goog.userAgent.ASSUME_WEBKIT=true',
'goog.userAgent.product.ASSUME_SAFARI=true',
'safaridriver.message.ORIGIN=1',
'safaridriver.message.FORCE_SYNCHRONOUS_PROXY_SEND=true',
],
externs = [
'externs/common.js',
'externs/webcontent.js',
],
flags = [
'--jscomp_error=accessControls',
'--jscomp_error=ambiguousFunctionDecl',
'--jscomp_error=checkRegExp',
'--jscomp_error=checkTypes',
'--jscomp_error=checkVars',
'--jscomp_error=constantProperty',
'--jscomp_error=deprecated',
'--jscomp_error=duplicateMessage',
'--jscomp_error=es5Strict',
'--jscomp_error=externsValidation',
'--jscomp_error=fileoverviewTags',
'--jscomp_error=globalThis',
'--jscomp_error=invalidCasts',
'--jscomp_error=missingProperties',
'--jscomp_error=nonStandardJsDocs',
'--jscomp_error=strictModuleDepCheck',
'--jscomp_error=typeInvalidation',
'--jscomp_error=undefinedVars',
'--jscomp_error=unknownDefines',
'--jscomp_error=uselessCode',
'--jscomp_error=visibility',

'--language_in=ECMASCRIPT6_STRICT',
'--language_out=ECMASCRIPT5_STRICT',

"--output_wrapper='%output%;safaridriver.debug.init();'",
'--third_party=false',
],
deps = [
':command',
':common',
'//javascript/safari-driver/message:message',
'//javascript/webdriver:base',
'//javascript/webdriver:capabilities',
'//javascript/webdriver:session',
'//javascript/webdriver:webdriver',
'//third_party/closure:closure',
],
)

# The global extension script.
js_binary(
name = 'extension',
srcs = [
'deps.js',
'extension/commands.js',
'extension/extension.js',
'extension/logdb.js',
'extension/server.js',
'extension/session.js',
'extension/tab.js',
'extension/tabmanager.js',
],
defines = [
'goog.userAgent.ASSUME_WEBKIT=true',
'goog.userAgent.product.ASSUME_SAFARI=true',
'safaridriver.message.ORIGIN=0'
],
externs = [
'externs/common.js',
'externs/extension.js',
],
flags = [
'--jscomp_error=accessControls',
'--jscomp_error=ambiguousFunctionDecl',
'--jscomp_error=checkRegExp',
'--jscomp_error=checkTypes',
'--jscomp_error=checkVars',
'--jscomp_error=constantProperty',
'--jscomp_error=deprecated',
'--jscomp_error=duplicateMessage',
'--jscomp_error=es5Strict',
'--jscomp_error=externsValidation',
'--jscomp_error=fileoverviewTags',
'--jscomp_error=globalThis',
'--jscomp_error=invalidCasts',
'--jscomp_error=missingProperties',
'--jscomp_error=nonStandardJsDocs',
'--jscomp_error=strictModuleDepCheck',
'--jscomp_error=typeInvalidation',
'--jscomp_error=undefinedVars',
'--jscomp_error=unknownDefines',
'--jscomp_error=uselessCode',
'--jscomp_error=visibility',

'--language_in=ECMASCRIPT6_STRICT',
'--language_out=ECMASCRIPT5_STRICT',

"--output_wrapper='%output%;safaridriver.extension.init();'",
'--third_party=false',
],
deps = [
':common',
'//javascript/safari-driver/message:message',
'//javascript/webdriver:webdriver',
'//third_party/closure:closure',
],
)

# Packages everything up into a .safariextension folder that can be loaded by
# Safari's Extension Builder.
folder(
name = 'safari-driver',
out = 'SafariDriver.safariextension',
srcs = [
':debug',
':extension',
# ':injected',
# ':page',
'Info.plist',
'icon.png',
'toolbar.png',
'debug/log.html',
'extension/extension.html',
],
visibility = [
'//java/client/src/org/openqa/selenium/safari:safari',
],
)
66 changes: 0 additions & 66 deletions javascript/safari-driver/Info.plist
View file

This file was deleted.

21 changes: 4 additions & 17 deletions javascript/safari-driver/README
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
To use:
The SafariDriver code has been moved to the `safari` branch:

1.) Sign up for the Safari developer program online, at
https://developer.apple.com/programs/safari/
2.) Generate a signed developer certificate.
https://github.com/seleniumhq/selenium/tree/safari

3.) $ ./go //javascript/safari-driver:SafariDriver
4.) Launch Safari
5.) Develop > Show ExtensionBuilder
6.) Add Extension
7.) Select ./build/javascript/safari-driver/SafariDriver.safariextension
8.) Install

To reload any changes made:

1.) $ ./go //javascript/safari-driver:SafariDriver
2.) Develop > Show ExtensionBuilder
3.) Select WebDriver extension
4.) Reload
This directly only contains a snapshot of the JavaScript needed by clients to
initiate a connection with the SafariDriver.
Loading

0 comments on commit a793d61

Please sign in to comment.