Skip to content

Commit c321805

Browse files
committed
rb: removed all extension related methods from Safari options
1 parent 811d2c9 commit c321805

File tree

4 files changed

+0
-296
lines changed

4 files changed

+0
-296
lines changed

rb/lib/selenium/webdriver/safari/bridge.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ def initialize(opts = {})
3131

3232
@command_id ||= 0
3333

34-
@extensions = Extensions.new(safari_options)
35-
@extensions.install
36-
3734
# TODO: handle safari_opts['cleanSession']
3835
@server = Server.new(safari_options.port, command_timeout)
3936
@server.start
@@ -51,7 +48,6 @@ def quit
5148

5249
@server.stop
5350
@safari.stop
54-
@extensions.uninstall
5551
end
5652

5753
def driver_extensions

rb/lib/selenium/webdriver/safari/extensions.rb

Lines changed: 0 additions & 189 deletions
This file was deleted.

rb/lib/selenium/webdriver/safari/options.rb

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,15 @@ module WebDriver
2222
module Safari
2323
class Options
2424
attr_accessor :port, :data_dir, :skip_extension_installation
25-
attr_reader :extensions
2625

2726
def initialize(opts = {})
28-
@extensions = []
2927
extract_options(opts)
3028
end
3129

32-
def add_extension(ext)
33-
@extensions << verify_safari_extension(ext)
34-
end
35-
3630
def clean_session?
3731
!!@clean_session
3832
end
3933

40-
def skip_extension_installation?
41-
!!@skip_extension_installation
42-
end
43-
4434
def to_capabilities
4535
caps = Remote::Capabilities.safari
4636
caps.merge!('safari.options' => as_json)
@@ -53,43 +43,15 @@ def as_json
5343
'port' => port,
5444
'dataDir' => data_dir,
5545
'cleanSession' => clean_session?,
56-
'extensions' => extensions_as_json,
57-
'skipExtensionInstallation' => skip_extension_installation?
5846
}
5947
end
6048

6149
private
6250

63-
def extensions_as_json
64-
@extensions.map do |path|
65-
{'filename' => path.basename, 'contents' => Base64.strict_encode64(path.read) }
66-
end
67-
end
68-
6951
def extract_options(opts)
7052
@port = Integer(opts[:port] || PortProber.random)
7153
@data_dir = opts[:custom_data_dir] || opts[:data_dir]
7254
@clean_session = opts[:clean_session]
73-
74-
Array(opts[:extensions]).each { |ext| add_extension(ext) }
75-
76-
if opts.key?(:install_extension)
77-
@skip_extension_installation = !opts[:install_extension]
78-
elsif opts.key?(:skip_extension_installation)
79-
@skip_extension_installation = opts[:skip_extension_installation]
80-
else
81-
@skip_extension_installation = false
82-
end
83-
end
84-
85-
def verify_safari_extension(path)
86-
pn = Pathname.new(path)
87-
88-
unless pn.file? && pn.extname == '.safariextz'
89-
raise ArgumentError, "invalid Safari extension path: #{path}"
90-
end
91-
92-
pn
9355
end
9456

9557
end # Options

rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)