From af2960f02e4bf0dd2d06496dbcfd0dfedf9f003e Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Fri, 21 Feb 2025 00:55:36 -0800 Subject: [PATCH 1/3] ci: add base path --- .github/workflows/functional-test.yml | 6 +++--- test/test_helper.rb | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index d7fcf0c9..df905b3e 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -68,7 +68,7 @@ jobs: appium driver install xcuitest appium plugin install images appium plugin install execute-driver - nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log & + nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log & - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -131,7 +131,7 @@ jobs: appium driver install xcuitest appium plugin install images@2.1.8 appium plugin install execute-driver - nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log & + nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors > appium.log & - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -216,7 +216,7 @@ jobs: appium driver install ${{matrix.test_targets.automation_name}} appium plugin install images appium plugin install execute-driver - nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log & + nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors > appium.log & - name: Enable KVM group perms run: | diff --git a/test/test_helper.rb b/test/test_helper.rb index 85cdacc6..6bff46b7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -158,6 +158,7 @@ def ios(platform_name = :ios) 'settings[pageSourceExcludedAttributes]': 'visible' }, appium_lib: { + server_url: 'http://127.0.0.1:4723/wd/hub', wait_timeout: 20, wait_interval: 1 } @@ -298,6 +299,7 @@ def android(activity_name = nil) uiautomator2ServerLaunchTimeout: 60_000 # ms }, appium_lib: { + server_url: 'http://127.0.0.1:4723/wd/hub', wait: 5, wait_timeout: 20, wait_interval: 1 From d79adfb09d991c9763922f06e0b76c8184de8ad0 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Fri, 21 Feb 2025 01:11:09 -0800 Subject: [PATCH 2/3] only for e2e --- test/test_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 6bff46b7..1d7a305b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -158,7 +158,7 @@ def ios(platform_name = :ios) 'settings[pageSourceExcludedAttributes]': 'visible' }, appium_lib: { - server_url: 'http://127.0.0.1:4723/wd/hub', + server_url: ENV['CI'] ? 'http://127.0.0.1:4723/wd/hub' : nil, wait_timeout: 20, wait_interval: 1 } @@ -299,7 +299,7 @@ def android(activity_name = nil) uiautomator2ServerLaunchTimeout: 60_000 # ms }, appium_lib: { - server_url: 'http://127.0.0.1:4723/wd/hub', + server_url: ENV['CI'] ? 'http://127.0.0.1:4723/wd/hub' : nil, wait: 5, wait_timeout: 20, wait_interval: 1 From a74807ce074e3e8bbfea7d30be235220d4e4799b Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Fri, 21 Feb 2025 01:22:51 -0800 Subject: [PATCH 3/3] try --- test/test_helper.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 1d7a305b..aba04b3f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -101,6 +101,10 @@ def self.appium_version end class Caps + def ci? + ENV['CI'] == 'true' + end + def self.ios(platform_name = :ios) new.ios(platform_name) end @@ -158,7 +162,7 @@ def ios(platform_name = :ios) 'settings[pageSourceExcludedAttributes]': 'visible' }, appium_lib: { - server_url: ENV['CI'] ? 'http://127.0.0.1:4723/wd/hub' : nil, + server_url: ci? ? 'http://127.0.0.1:4723/wd/hub' : nil, wait_timeout: 20, wait_interval: 1 } @@ -299,7 +303,7 @@ def android(activity_name = nil) uiautomator2ServerLaunchTimeout: 60_000 # ms }, appium_lib: { - server_url: ENV['CI'] ? 'http://127.0.0.1:4723/wd/hub' : nil, + server_url: ci? ? 'http://127.0.0.1:4723/wd/hub' : nil, wait: 5, wait_timeout: 20, wait_interval: 1