Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use /se/log and /se/log/types for logs #582

Merged
merged 3 commits into from
Jan 8, 2025
+7 −5
Merged

feat: use /se/log and /se/log/types for logs #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f6f517
feat: use /se/log and /se/log/types for logs
KazuCocoa Jan 7, 2025
31583af
fix warnings
KazuCocoa Jan 8, 2025
7cd626e
fix test
KazuCocoa Jan 8, 2025
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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