Skip to content
Open
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
8 changes: 4 additions & 4 deletions .github/workflows/functional-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ concurrency:

jobs:
ios_test:
runs-on: macos-14
runs-on: macos-15
env:
XCODE_VERSION: 15.3
IOS_VERSION: 17.4
IOS_DEVICE_NAME: iPhone 15 Plus
XCODE_VERSION: 16.4
IOS_VERSION: 18.5
IOS_DEVICE_NAME: iPhone 16 Plus

steps:
- uses: actions/checkout@v6
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ source 'https://rubygems.org'
gemspec

gem 'appium_thor', '~> 2.0'
gem 'fakefs', '~> 3.0.0'
gem 'hashdiff', '~> 1.2.0'
gem 'minitest', '~> 5.0'
gem 'minitest-reporters', '~> 1.1'
Expand Down
33 changes: 0 additions & 33 deletions android_tests/lib/android/specs/common/command/command.rb

This file was deleted.

21 changes: 7 additions & 14 deletions android_tests/lib/android/specs/driver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

require 'tmpdir'

# rake "android[driver]"
class AndroidTest
class Driver < Minitest::Test
Expand Down Expand Up @@ -105,20 +107,11 @@ def test_07_absolute_app_path
validate_path 'sauce-storage:some_storage_suffix'
validate_path 'http://www.saucelabs.com'

# fake real paths for osx/windows.
FakeFS.activate!

osx_existing_path = '/Users/user/myapp.app'
FileUtils.mkdir_p osx_existing_path
validate_path osx_existing_path

# TODO: FakeFS fails on Windows paths due to the drive letters.
# Look into how opscode/chef tests this.
# windows_existing_path = "C:\\Program Files\\myapp.apk"
# FileUtils.mkdir_p windows_existing_path
# validate_path windows_existing_path

FakeFS.deactivate!
Dir.mktmpdir do |tmp_dir|
existing_path = File.join(tmp_dir, 'myapp.app')
FileUtils.mkdir_p existing_path
validate_path existing_path
end

# bundle id test
validate_path 'my.bundle.id'
Expand Down
1 change: 0 additions & 1 deletion android_tests/lib/run.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
require 'minitest/autorun'
require 'minitest/reporters'
require 'minitest'
require 'fakefs/safe'
require 'hashdiff'
require_relative '../../lib/appium_lib'

Expand Down
3 changes: 1 addition & 2 deletions appium_lib.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/appium/ruby_lib' # published as appium_lib
s.require_paths = ['lib']

# TODO: We must remove start_logs_broadcast/stop_logs_broadcast to bump the appium_lib_core version to v12+.
s.add_dependency 'appium_lib_core', '>= 9.2.1', '< 12.0'
s.add_dependency 'appium_lib_core', '>= 9.2.1', '< 13.0'
s.add_dependency 'nokogiri', '~> 1.8', '>= 1.8.1'
s.add_dependency 'tomlrb', '>= 1.1', '< 3.0'

Expand Down
4 changes: 2 additions & 2 deletions ios_tests/appium.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[caps]
platformName = "ios"
platformVersion = "17.4"
deviceName ="iPhone 15 Plus"
platformVersion = "18.5"
deviceName ="iPhone 16 Plus"
automationName = 'XCUITest'
app = "../test_apps/UICatalog.app.zip"
someCapability = "some_capability"
Expand Down
38 changes: 0 additions & 38 deletions ios_tests/lib/ios/specs/common/command/command.rb

This file was deleted.

31 changes: 0 additions & 31 deletions lib/appium_lib/android/common/command/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,6 @@ def shell(command, arguments)
# --relaxed-security
@driver.execute_script 'mobile: shell', args
end

# @deprecated Please use BiDi implementation via `$driver.driver.bidi` directly instead.
#
# Starts Android logcat broadcast websocket
#
# @param [String] logcat_file A file path to write messages from a logcat WebSocket client
#
# @example
#
# start_logs_broadcast 'outputfile.log' #=> #<Appium::Android::Command::WsLogcat:...>
#
def start_logs_broadcast(logcat_file = 'logcat.log')
@driver.execute_script 'mobile: startLogsBroadcast'

socket_url = "ws://#{URI.parse(server_url).host}:#{@core.port}/ws/session/#{@driver.session_id}/appium/device/logcat"
@logcat_client = ::Appium::Common::Command::WsLogcat.new(url: socket_url, output_file: logcat_file)
end

# @deprecated Please use BiDi implementation directly instead.
#
# Stop Android logcat broadcast websocket
#
# @example
#
# stop_logs_broadcast #=> nil
#
def stop_logs_broadcast
@logcat_client.close

@driver.execute_script 'mobile: stopLogsBroadcast'
end
end
end
end
2 changes: 0 additions & 2 deletions lib/appium_lib/common/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

require_relative 'command/ws_logcat'

module Appium
module Common
module Command
Expand Down
31 changes: 0 additions & 31 deletions lib/appium_lib/common/command/ws_logcat.rb

This file was deleted.

1 change: 0 additions & 1 deletion lib/appium_lib/ios/xcuitest/bridge.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def self.for(target)
target.extend Appium::Ios::Xcuitest::Gesture
target.extend Appium::Ios::Xcuitest::MultiAppHandler
target.extend Appium::Ios::Xcuitest::Element
target.extend Appium::Ios::Xcuitest::Command
target.extend Appium::Ios::Xcuitest::GetContext
end
end
Expand Down
39 changes: 0 additions & 39 deletions lib/appium_lib/ios/xcuitest/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,3 @@
require_relative 'command/source'
require_relative 'command/multi_app_handler'
require_relative 'command/get_context'

module Appium
module Ios
module Xcuitest
module Command
# @deprecated Please use BiDi implementation via `$driver.driver.bidi` directly instead.
#
# Starts iOS syslog broadcast websocket
#
# @param [String] syslog_file A file path to write messages from a syslog WebSocket client
#
# @example
#
# start_logs_broadcast 'outputfile.log' #=> #<Appium::Android::Command::WsLogcat:...>
#
def start_logs_broadcast(syslog_file = 'syslog.log')
@driver.execute_script 'mobile: startLogsBroadcast'

socket_url = "ws://#{URI.parse(server_url).host}:#{@core.port}/ws/session/#{@driver.session_id}/appium/device/syslog"
@logcat_client = ::Appium::Common::Command::WsLogcat.new(url: socket_url, output_file: syslog_file)
end

# @deprecated Please use BiDi implementation directly instead.
#
# Stop iOS syslog broadcast websocket
#
# @example
#
# stop_logs_broadcast #=> nil
#
def stop_logs_broadcast
@logcat_client.close

@driver.execute_script 'mobile: stopLogsBroadcast'
end
end
end
end
end
Loading