Skip to content

Commit dbabc04

Browse files
committed
fix
1 parent 7266e77 commit dbabc04

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

Diff for: rb/spec/integration/selenium/webdriver/driver_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module WebDriver
2424
describe Driver, exclusive: {bidi: false, reason: 'Not yet implemented with BiDi'} do
2525
it_behaves_like 'driver that can be started concurrently', exclude: [
2626
{browser: %i[safari safari_preview]},
27-
{driver: 'remote', rbe: true, reason: 'Cannot start 2+ drivers at once.'}
27+
{driver: :remote, rbe: true, reason: 'Cannot start 2+ drivers at once.'}
2828
]
2929

3030
it 'creates default capabilities', exclude: {browser: %i[safari safari_preview]} do

Diff for: rb/spec/integration/selenium/webdriver/firefox/profile_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ module Firefox
3737
end
3838

3939
it 'is able to use the same profile more than once',
40-
exclude: {driver: 'remote', rbe: true, reason: 'Cannot start 2+ drivers at once.'} do
40+
exclude: {driver: :remote, rbe: true, reason: 'Cannot start 2+ drivers at once.'} do
41+
abort
4142
reset_driver!(profile: profile) do |driver1|
4243
expect { wait(5).until { driver1.find_element(id: 'oneline') } }.not_to raise_error
4344
reset_driver!(profile: profile) do |driver2|

Diff for: rb/spec/integration/selenium/webdriver/spec_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
guards.add_condition(:platform, WebDriver::Platform.os)
5858
guards.add_condition(:headless, !ENV['HEADLESS'].nil?)
5959
guards.add_condition(:bidi, !ENV['WEBDRIVER_BIDI'].nil?)
60-
guards.add_condition(:rbe, Dir.pwd.start_with?('/mnt/engflow'))
60+
guards.add_condition(:rbe, GlobalTestEnv.rbe?)
6161

6262
results = guards.disposition
6363
send(*results) if results

Diff for: rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ def bazel_java
115115
File.expand_path(File.read(File.expand_path(ENV.fetch('WD_BAZEL_JAVA_LOCATION'))).chomp)
116116
end
117117

118+
def rbe?
119+
Dir.pwd.start_with?('/mnt/engflow')
120+
end
121+
118122
def reset_remote_server
119123
@remote_server&.stop
120124
@remote_server = nil
@@ -201,7 +205,8 @@ def current_env
201205
driver: driver,
202206
version: driver_instance.capabilities.browser_version,
203207
platform: Platform.os,
204-
ci: Platform.ci
208+
ci: Platform.ci,
209+
rbe: rbe?
205210
}
206211
end
207212

0 commit comments

Comments
 (0)