Skip to content

Commit 1ff41b2

Browse files
committed
rb - No More RC!
1 parent e988bbb commit 1ff41b2

47 files changed

Lines changed: 10 additions & 14555 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Rakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ task :test_java => [
250250

251251
task :test_rb => [
252252
"//rb:unit-test",
253-
"//rb:rc-client-unit-test",
254-
"//rb:rc-client-integration-test",
255253
"//rb:chrome-test",
256254
"//rb:firefox-test",
257255
"//rb:phantomjs-test",

rb/build.desc

Lines changed: 10 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ rubygem(
1111
"//rb:iphone",
1212
"//rb:phantomjs",
1313
"//rb:remote",
14-
"//rb:rc-client",
1514
"//rb:safari"
1615
]
1716
)
@@ -32,7 +31,6 @@ ruby_library(name = "common",
3231
"lib/selenium/webdriver/common.rb",
3332
"lib/selenium/webdriver.rb",
3433
"lib/selenium/server.rb",
35-
"lib/selenium/rake/server_task.rb",
3634
"lib/selenium-webdriver.rb",
3735
"selenium-webdriver.gemspec",
3836
"Gemfile",
@@ -222,7 +220,7 @@ ruby_test(name = "remote",
222220
],
223221
include = ["rb/spec/integration", "build/rb/lib"],
224222
deps = [
225-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
223+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
226224
":remote"
227225
]
228226
)
@@ -234,7 +232,7 @@ ruby_test(name = "remote-chrome",
234232
],
235233
include = ["rb/spec/integration", "build/rb/lib"],
236234
deps = [
237-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
235+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
238236
":remote"
239237
]
240238
)
@@ -246,7 +244,7 @@ ruby_test(name = "remote-firefox",
246244
],
247245
include = ["rb/spec/integration", "build/rb/lib"],
248246
deps = [
249-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
247+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
250248
":remote"
251249
]
252250
)
@@ -258,7 +256,7 @@ ruby_test(name = "remote-phantomjs",
258256
],
259257
include = ["rb/spec/integration", "build/rb/lib"],
260258
deps = [
261-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
259+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
262260
":remote"
263261
]
264262
)
@@ -270,7 +268,7 @@ ruby_test(name = "remote-safari",
270268
],
271269
include = ["rb/spec/integration", "build/rb/lib"],
272270
deps = [
273-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
271+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
274272
":remote"
275273
]
276274
)
@@ -282,7 +280,7 @@ ruby_test(name = "remote-ie",
282280
],
283281
include = ["rb/spec/integration", "build/rb/lib"],
284282
deps = [
285-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
283+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
286284
":remote"
287285
]
288286
)
@@ -294,7 +292,7 @@ ruby_test(name = "remote-edge",
294292
],
295293
include = ["rb/spec/integration", "build/rb/lib"],
296294
deps = [
297-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
295+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
298296
":edge"
299297
]
300298
)
@@ -306,7 +304,7 @@ ruby_test(name = "remote-marionette",
306304
],
307305
include = ["rb/spec/integration", "build/rb/lib"],
308306
deps = [
309-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
307+
"//java/server/src/org/openqa/selenium/remote/server:standalone-server",
310308
":remote",
311309
":firefox"
312310
]
@@ -319,7 +317,7 @@ ruby_library(name = "safari",
319317
],
320318
deps = [
321319
":common",
322-
":remote",
320+
":remote"
323321
],
324322
resources = [
325323
{ "//javascript/safari-driver:client": "rb/lib/selenium/webdriver/safari/resources/client.js"}
@@ -337,22 +335,9 @@ ruby_test(name = "safari",
337335
]
338336
)
339337

340-
ruby_library(name = "rc-client",
341-
srcs = [
342-
"lib/selenium/client/**/*.rb",
343-
"lib/selenium/client.rb",
344-
"lib/selenium-client.rb",
345-
"lib/selenium/rspec/**/*.rb",
346-
],
347-
deps = [
348-
":common"
349-
]
350-
)
351-
352338
ruby_test(name = "unit",
353339
srcs = [
354340
"spec/unit/selenium/webdriver/**/*_spec.rb",
355-
"spec/unit/selenium/rake/*_spec.rb",
356341
"spec/unit/selenium/*_spec.rb",
357342
],
358343
include = ["rb/spec/unit", "build/rb/lib"],
@@ -367,36 +352,6 @@ ruby_test(name = "unit",
367352
":remote",
368353
":safari",
369354
":phantomjs",
370-
":support",
371-
]
372-
)
373-
374-
ruby_test(name = "rc-client-unit",
375-
srcs = [
376-
"spec/unit/selenium/client/**/*_spec.rb"
377-
],
378-
include = [
379-
"build/rb/lib",
380-
"rb/spec/unit"
381-
],
382-
deps = [
383-
":rc-client"
384-
]
385-
)
386-
387-
ruby_test(name = "rc-client-integration",
388-
srcs = [
389-
"spec/integration/selenium/client/api/*_spec.rb",
390-
"spec/integration/selenium/client/reporting/*_spec.rb",
391-
"spec/integration/selenium/client/smoke/*_spec.rb"
392-
],
393-
include = [
394-
"build/rb/lib",
395-
"rb/spec/integration"
396-
],
397-
deps = [
398-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
399-
":rc-client",
400-
":remote"
355+
":support"
401356
]
402357
)

rb/lib/selenium-client.rb

Lines changed: 0 additions & 21 deletions
This file was deleted.

rb/lib/selenium/client.rb

Lines changed: 0 additions & 57 deletions
This file was deleted.

rb/lib/selenium/client/base.rb

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)