Skip to content

Commit 5c4b3a1

Browse files
titusfortnertitusfortner
committed
rb - update build files
1 parent 071c291 commit 5c4b3a1

File tree

6 files changed

+33
-254
lines changed

6 files changed

+33
-254
lines changed

‎Rakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ task :support => [
172172
desc 'Build the standalone server'
173173
task 'selenium-server-standalone' => '//java/server/src/org/openqa/grid/selenium:selenium'
174174

175-
task 'selenium-server-standalone-v3' => '//java/server/src/org/openqa/grid/selenium:selenium'
176-
177175
task :ide => [ "//ide:selenium-ide-multi" ]
178176
task :ide_proxy_setup => [ "//javascript/selenium-atoms", "se_ide:setup_proxy" ]
179177
task :ide_proxy_remove => [ "se_ide:remove_proxy" ]

‎rb/build.desc

Lines changed: 30 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
rubygem(
22
gemspec = "build/rb/selenium-webdriver.gemspec",
33
deps = [
4-
"//rb:android",
54
"//rb:chrome",
65
"//rb:common",
76
"//rb:support",
87
"//rb:edge",
98
"//rb:firefox",
109
"//rb:ie",
11-
"//rb:iphone",
1210
"//rb:phantomjs",
1311
"//rb:remote",
1412
"//rb:safari"
@@ -29,6 +27,8 @@ ruby_library(name = "common",
2927
srcs = [
3028
"lib/selenium/webdriver/common/**/*.rb",
3129
"lib/selenium/webdriver/common.rb",
30+
"lib/selenium/webdriver/remote/**/*.rb",
31+
"lib/selenium/webdriver/remote.rb",
3232
"lib/selenium/webdriver.rb",
3333
"lib/selenium/server.rb",
3434
"lib/selenium-webdriver.rb",
@@ -39,8 +39,7 @@ ruby_library(name = "common",
3939
],
4040
resources = [
4141
{ "../LICENSE" : "rb/LICENSE" }
42-
],
43-
deps = [ "//java/client/test/org/openqa/selenium/environment" ]
42+
]
4443
)
4544

4645
ruby_library(name = "support",
@@ -50,35 +49,12 @@ ruby_library(name = "support",
5049
]
5150
)
5251

53-
ruby_library(name = "android",
54-
srcs = [
55-
"lib/selenium/webdriver/android/**/*.rb",
56-
"lib/selenium/webdriver/android.rb"
57-
],
58-
deps = [
59-
":common",
60-
":remote"
61-
]
62-
)
63-
64-
ruby_test(name = "android",
65-
srcs = [
66-
"spec/integration/selenium/webdriver/*_spec.rb",
67-
"spec/integration/selenium/webdriver/android/**/*_spec.rb"
68-
],
69-
include = ["rb/spec/integration", "build/rb/lib"],
70-
deps = [ ":android" ]
71-
)
72-
7352
ruby_library(name = "chrome",
7453
srcs = [
7554
"lib/selenium/webdriver/chrome/**/*.rb",
7655
"lib/selenium/webdriver/chrome.rb"
7756
],
78-
deps = [
79-
":common",
80-
":remote"
81-
]
57+
deps = [":common"]
8258
)
8359

8460
ruby_test(name = "chrome",
@@ -87,18 +63,15 @@ ruby_test(name = "chrome",
8763
"spec/integration/selenium/webdriver/chrome/**/*_spec.rb"
8864
],
8965
include = ["rb/spec/integration", "build/rb/lib"],
90-
deps = [ ":chrome" ]
66+
deps = [":chrome"]
9167
)
9268

9369
ruby_library(name = "edge",
9470
srcs = [
9571
"lib/selenium/webdriver/edge/**/*.rb",
9672
"lib/selenium/webdriver/edge.rb"
9773
],
98-
deps = [
99-
":common",
100-
":remote"
101-
]
74+
deps = [":common"]
10275
)
10376

10477
ruby_test(name = "edge",
@@ -110,15 +83,6 @@ ruby_test(name = "edge",
11083
deps = [ ":edge" ]
11184
)
11285

113-
ruby_test(name = "marionette",
114-
srcs = [
115-
"spec/integration/selenium/webdriver/*_spec.rb",
116-
"spec/integration/selenium/webdriver/firefox/**/*_spec.rb"
117-
],
118-
include = ["rb/spec/integration", "build/rb/lib"],
119-
deps = [ ":firefox" ]
120-
)
121-
12286
ruby_library(name = "firefox",
12387
srcs = [
12488
"lib/selenium/webdriver/firefox/**/*.rb",
@@ -130,7 +94,7 @@ ruby_library(name = "firefox",
13094
{ "//cpp:noblur" : "rb/lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so" },
13195
{ "//cpp:noblur64" : "rb/lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so" }
13296
],
133-
deps = [ ":remote" ]
97+
deps = [":common"]
13498
)
13599

136100
ruby_test(name = "firefox",
@@ -147,10 +111,7 @@ ruby_library(name = "ie",
147111
"lib/selenium/webdriver/ie/**/*.rb",
148112
"lib/selenium/webdriver/ie.rb"
149113
],
150-
deps = [
151-
":common",
152-
":remote"
153-
]
114+
deps = [":common"]
154115
)
155116

156117
ruby_test(name = "ie",
@@ -162,34 +123,29 @@ ruby_test(name = "ie",
162123
deps = [ ":ie" ]
163124
)
164125

165-
ruby_library(name = "iphone",
126+
ruby_library(name = "marionette",
166127
srcs = [
167-
"lib/selenium/webdriver/iphone/**/*.rb",
168-
"lib/selenium/webdriver/iphone.rb"
128+
"lib/selenium/webdriver/firefox/**/*.rb",
129+
"lib/selenium/webdriver/firefox.rb"
169130
],
170-
deps = [
171-
":common",
172-
":remote"
173-
]
131+
deps = [":common"]
174132
)
175133

176-
ruby_test(name = "iphone",
134+
ruby_test(name = "marionette",
177135
srcs = [
178136
"spec/integration/selenium/webdriver/*_spec.rb",
179-
"spec/integration/selenium/webdriver/iphone/**/*_spec.rb"
137+
"spec/integration/selenium/webdriver/firefox/**/*_spec.rb"
180138
],
181139
include = ["rb/spec/integration", "build/rb/lib"],
182-
deps = [ ":iphone" ]
140+
deps = [":marionette"]
183141
)
184142

185143
ruby_library(name = "phantomjs",
186144
srcs = [
187145
"lib/selenium/webdriver/phantomjs/**/*.rb",
188146
"lib/selenium/webdriver/phantomjs.rb"
189147
],
190-
deps = [
191-
":common"
192-
]
148+
deps = [":common"]
193149
)
194150

195151
ruby_test(name = "phantomjs",
@@ -198,10 +154,7 @@ ruby_test(name = "phantomjs",
198154
"spec/integration/selenium/webdriver/phantomjs/**/*_spec.rb"
199155
],
200156
include = ["rb/spec/integration", "build/rb/lib"],
201-
deps = [
202-
":remote",
203-
":phantomjs"
204-
]
157+
deps = [":phantomjs"]
205158
)
206159
ruby_library(name = "remote",
207160
srcs = [
@@ -220,9 +173,7 @@ ruby_test(name = "remote",
220173
"spec/integration/selenium/webdriver/remote/**/*_spec.rb"
221174
],
222175
include = ["rb/spec/integration", "build/rb/lib"],
223-
deps = [
224-
":remote"
225-
]
176+
deps = [":remote"]
226177
)
227178

228179
ruby_test(name = "remote-chrome",
@@ -231,9 +182,7 @@ ruby_test(name = "remote-chrome",
231182
"spec/integration/selenium/webdriver/remote/**/*_spec.rb"
232183
],
233184
include = ["rb/spec/integration", "build/rb/lib"],
234-
deps = [
235-
":remote"
236-
]
185+
deps = [":remote"]
237186
)
238187

239188
ruby_test(name = "remote-firefox",
@@ -243,7 +192,8 @@ ruby_test(name = "remote-firefox",
243192
],
244193
include = ["rb/spec/integration", "build/rb/lib"],
245194
deps = [
246-
":remote"
195+
":remote",
196+
":firefox"
247197
]
248198
)
249199

@@ -253,9 +203,7 @@ ruby_test(name = "remote-phantomjs",
253203
"spec/integration/selenium/webdriver/remote/**/*_spec.rb"
254204
],
255205
include = ["rb/spec/integration", "build/rb/lib"],
256-
deps = [
257-
":remote"
258-
]
206+
deps = [":remote"]
259207
)
260208

261209
ruby_test(name = "remote-safari",
@@ -265,7 +213,8 @@ ruby_test(name = "remote-safari",
265213
],
266214
include = ["rb/spec/integration", "build/rb/lib"],
267215
deps = [
268-
":remote"
216+
":remote",
217+
":safari"
269218
]
270219
)
271220

@@ -275,9 +224,7 @@ ruby_test(name = "remote-ie",
275224
"spec/integration/selenium/webdriver/remote/**/*_spec.rb"
276225
],
277226
include = ["rb/spec/integration", "build/rb/lib"],
278-
deps = [
279-
":remote"
280-
]
227+
deps = [":remote"]
281228
)
282229

283230
ruby_test(name = "remote-edge",
@@ -287,6 +234,7 @@ ruby_test(name = "remote-edge",
287234
],
288235
include = ["rb/spec/integration", "build/rb/lib"],
289236
deps = [
237+
":remote",
290238
":edge"
291239
]
292240
)
@@ -297,21 +245,15 @@ ruby_test(name = "remote-marionette",
297245
"spec/integration/selenium/webdriver/remote/**/*_spec.rb"
298246
],
299247
include = ["rb/spec/integration", "build/rb/lib"],
300-
deps = [
301-
":remote",
302-
":firefox"
303-
]
248+
deps = [":remote"]
304249
)
305250

306251
ruby_library(name = "safari",
307252
srcs = [
308-
"lib/selenium/webdriver/safari/**/*.rb",
253+
"lib/selenium/webdriver/safari/**/* .rb",
309254
"lib/selenium/webdriver/safari.rb"
310255
],
311-
deps = [
312-
":common",
313-
":remote"
314-
],
256+
deps = [":common"],
315257
resources = [
316258
{ "//javascript/safari-driver:client": "rb/lib/selenium/webdriver/safari/resources/client.js"}
317259
]
@@ -323,9 +265,7 @@ ruby_test(name = "safari",
323265
"spec/integration/selenium/webdriver/safari/**/*_spec.rb"
324266
],
325267
include = ["rb/spec/integration", "build/rb/lib"],
326-
deps = [
327-
":safari"
328-
]
268+
deps = [":safari"]
329269
)
330270

331271
ruby_test(name = "unit",
@@ -335,13 +275,11 @@ ruby_test(name = "unit",
335275
],
336276
include = ["rb/spec/unit", "build/rb/lib"],
337277
deps = [
338-
":android",
339278
":chrome",
340279
":common",
341280
":edge",
342281
":firefox",
343282
":ie",
344-
":iphone",
345283
":remote",
346284
":safari",
347285
":phantomjs",

‎rb/spec/integration/selenium/webdriver/firefox/marionette_spec.rb

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -135,39 +135,6 @@ def restart_remote_server
135135
end
136136
end
137137

138-
compliant_on :browser => :marionette do
139-
# These pass in isolation, but can not run in suite due to https://github.com/SeleniumHQ/selenium/issues/1150
140-
context "when designated firefox binary does not include Marionette" do
141-
let(:message) { /Marionette is not supported in Firefox Version \d\d/ }
142-
143-
before do
144-
unless ENV['PRE_MARIONETTE_BINARY']
145-
pending "Set ENV['PRE_MARIONETTE_BINARY'] to test features on firefox versions without marionette"
146-
end
147-
end
148-
149-
it "Raises Wires Exception when setting marionette option in capabilities" do
150-
begin
151-
caps = Selenium::WebDriver::Remote::Capabilities.firefox(:marionette => true,
152-
:firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
153-
@opt.merge!(:desired_capabilities => caps)
154-
expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
155-
ensure
156-
Firefox::Binary.reset_path!
157-
end
158-
end
159-
160-
it "Raises Wires Exception when setting marionette option in driver initialization" do
161-
begin
162-
caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
163-
@opt.merge!(:marionette => true, :desired_capabilities => caps)
164-
expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
165-
ensure
166-
Firefox::Binary.reset_path!
167-
end
168-
end
169-
end
170-
end
171138
end # Firefox
172139
end # WebDriver
173140
end # Selenium

‎rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ def initialize
2929
@create_driver_error = nil
3030
@create_driver_error_count = 0
3131

32-
# TODO: get rid of ENV
33-
@driver = (ENV['WD_SPEC_DRIVER'] || raise("must set WD_SPEC_DRIVER")).strip.to_sym
32+
@driver = (ENV['WD_SPEC_DRIVER'] || :chrome).strip.to_sym
3433
end
3534

3635
def browser
3736
if driver == :remote
38-
(ENV['WD_REMOTE_BROWSER'] || :firefox).to_sym
37+
(ENV['WD_REMOTE_BROWSER'] || :chrome).to_sym
3938
else
4039
driver
4140
end
@@ -104,7 +103,7 @@ def remote_server?
104103
end
105104

106105
def remote_server_jar
107-
@remote_server_jar ||= root.join("build/java/server/src/org/openqa/grid/selenium/selenium-standalone.jar").to_s
106+
@remote_server_jar ||= root.join("buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar").to_s
108107
end
109108

110109
def quit

0 commit comments

Comments
 (0)