Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/appium_lib_core/common/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ module Commands
ime_deactivate: [:post, 'session/:session_id/ime/deactivate'],
ime_activate_engine: [:post, 'session/:session_id/ime/activate'],

### Logs
get_available_log_types: [:get, 'session/:session_id/log/types'],
get_log: [:post, 'session/:session_id/log'],
### Logs based on w3c selenium clients
get_available_log_types: [:get, 'session/:session_id/se/log/types'],
get_log: [:post, 'session/:session_id/se/log'],

###
# Appium own
Expand Down
4 changes: 3 additions & 1 deletion lib/appium_lib_core/driver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,9 @@ def get_app
def set_app_path
# FIXME: maybe `:app` should check `app` as well.
return unless @caps && get_app && !get_app.empty?
return if get_app =~ URI::DEFAULT_PARSER.make_regexp

uri_regex = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
return if get_app =~ uri_regex.make_regexp

app_path = File.expand_path(get_app)
@caps['app'] = if File.exist? app_path
Expand Down
2 changes: 1 addition & 1 deletion test/unit/driver_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_with_caps_and_appium_lib
opts = { 'caps' => { 'automationName': 'xcuitest' }, appium_lib: {} }
driver = ExampleDriver.new(opts)
refute_nil driver
assert_equal driver.core.caps[:automationName], nil
assert_nil driver.core.caps[:automationName]
end

def test_verify_appium_core_base_capabilities_create_capabilities
Expand Down
Loading