Skip to content

Commit b230512

Browse files
committed
chore: fix rubocop
1 parent 7146564 commit b230512

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

test/functional/ios/driver_test.rb

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ def uicatalog
3333
def setup
3434
@@core = ::Appium::Core.for(Caps.ios)
3535
@@driver = @@core.start_driver
36-
37-
require 'pry'
38-
binding.pry
3936
end
4037

4138
def teardown

test/functional/mac2/driver_test.rb

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ class DriverTest < AppiumLibCoreTest::Function::TestCase
2020
def setup
2121
@core = ::Appium::Core.for(Caps.mac2)
2222
@driver = @core.start_driver
23-
24-
require 'pry'
25-
binding.pry
2623
end
2724

2825
def teardown

test/test_helper.rb

+13-8
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def ios(platform_name = :ios)
124124
caps: { # :desiredCapabilities is also available
125125
platformName: platform_name,
126126
automationName: ENV['AUTOMATION_NAME_IOS'] || 'XCUITest',
127-
udid: '00008020-000E5CDA0A23002E',
127+
# udid: 'auto',
128128
platformVersion: platform_version,
129129
deviceName: device_name(platform_version, platform_name, wda_port),
130130
useNewWDA: false,
@@ -133,9 +133,6 @@ def ios(platform_name = :ios)
133133
someCapability: 'some_capability',
134134
newCommandTimeout: 120,
135135
wdaLocalPort: wda_port,
136-
browserName: 'safari',
137-
# nativeWebTap: true,
138-
webDriverAgent: 'http://192.168.4.24:8100',
139136
# `true`, which is the default value, is faster to finishing launching part in many cases
140137
# But sometimes `false` is necessary. It leads regressions sometimes though.
141138
waitForQuiescence: true,
@@ -152,6 +149,17 @@ def ios(platform_name = :ios)
152149
}
153150
}
154151

152+
if ENV['BUNDLE_ID'].nil?
153+
cap[:caps][:app] = if cap[:caps][:platformName].downcase == :tvos
154+
# Use https://github.com/KazuCocoa/tv-example as a temporary
155+
"#{Dir.pwd}/test/functional/app/tv-example.zip"
156+
else
157+
test_app platform_version
158+
end
159+
else
160+
cap[:caps][:bundleId] = ENV['BUNDLE_ID'] || 'io.appium.apple-samplecode.UICatalog'
161+
end
162+
155163
unless ENV['UNIT_TEST']
156164
xcode_org_id = ENV['ORG_ID'] || 'Simulator'
157165
cap = add_ios_real_device(cap.dup, xcode_org_id) if real_device
@@ -358,10 +366,7 @@ def mac2
358366
{
359367
caps: {
360368
platformName: :mac,
361-
automationName: :mac2,
362-
# "bundleId" => "com.apple.Finder",
363-
# webDriverAgentMacUrl: 'http://localhost:10100',
364-
# systemPort: 10100
369+
automationName: :mac2
365370
}
366371
}
367372
end

0 commit comments

Comments
 (0)