Skip to content

Commit 119021b

Browse files
committed
Deleting a bunch of code that is no longer used
Everything should still build (and tests are green). CI will complain if I missed something. Fixes #2080
1 parent c76adf8 commit 119021b

Some content is hidden

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

60 files changed

+43
-20665
lines changed

Rakefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,13 +433,6 @@ end
433433
desc "Calculate dependencies required for testing the automation atoms"
434434
task :calcdeps => "build/javascript/deps.js"
435435

436-
task :test_webdriverjs => [
437-
"//javascript/webdriver:es6_test:run"
438-
]
439-
440-
desc "Generate a single file with WebDriverJS' public API"
441-
task :webdriverjs => [ "//javascript/webdriver:webdriver" ]
442-
443436
desc "Repack jetty"
444437
task "repack-jetty" => "build/third_party/java/jetty/jetty-repacked.jar"
445438

javascript/remote/BUCK

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ js_binary(name = 'client',
1818
srcs = glob(['*.js', 'ui/*.js',]),
1919
deps = [
2020
'//javascript/atoms:errors',
21-
'//javascript/webdriver:base',
2221
'//javascript/webdriver:http',
23-
'//javascript/webdriver:session',
2422
'//third_party/closure:closure',
2523
],
2624
flags = [

javascript/remote/build.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ js_binary(name = "clientbin",
55
],
66
deps = [
77
"//javascript/atoms:all_js",
8-
"//javascript/webdriver:webdriver_lib",
8+
"//javascript/webdriver:http",
99
],
1010
flags = [
1111
"--jscomp_error=accessControls",
@@ -52,7 +52,7 @@ js_test(name = "test",
5252
deps = [
5353
"./**/*.js",
5454
"//javascript/atoms:all_js",
55-
"//javascript/webdriver:all_js",
55+
"//javascript/webdriver:http",
5656
"//java/client/test/org/openqa/selenium/javascript",
5757
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
5858
])

javascript/remote/ui/client.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ goog.provide('remote.ui.Client');
1919

2020
goog.require('bot.response');
2121
goog.require('goog.Disposable');
22+
goog.require('goog.Promise');
2223
goog.require('goog.Uri');
2324
goog.require('goog.array');
2425
goog.require('goog.debug.Console');
@@ -33,7 +34,6 @@ goog.require('remote.ui.WebDriverScriptButton');
3334
goog.require('webdriver.Command');
3435
goog.require('webdriver.CommandName');
3536
goog.require('webdriver.Session');
36-
goog.require('webdriver.promise');
3737

3838

3939

@@ -139,7 +139,7 @@ remote.ui.Client.prototype.disposeInternal = function() {
139139
* Initializes the client and renders it into the DOM.
140140
* @param {!Element=} opt_element The element to render to; defaults to the
141141
* current document's BODY element.
142-
* @return {!webdriver.promise.Promise} A promise that will be resolved when
142+
* @return {!goog.Promise} A promise that will be resolved when
143143
* the client has been initialized.
144144
*/
145145
remote.ui.Client.prototype.init = function(opt_element) {
@@ -166,7 +166,7 @@ remote.ui.Client.prototype.getSessionContainer = function() {
166166
/**
167167
* Executes a single command.
168168
* @param {!webdriver.Command} command The command to execute.
169-
* @return {!webdriver.promise.Promise} A promise that will be resolved with the
169+
* @return {!goog.Promise} A promise that will be resolved with the
170170
* command response.
171171
* @private
172172
*/
@@ -192,7 +192,7 @@ remote.ui.Client.prototype.logError_ = function(msg, e) {
192192

193193
/**
194194
* Queries the server for its build info.
195-
* @return {!webdriver.promise.Promise} A promise that will be resolved with the
195+
* @return {!goog.Promise} A promise that will be resolved with the
196196
* server build info.
197197
* @private
198198
*/

javascript/webdriver/BUCK

Lines changed: 7 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,12 @@
1-
2-
js_library(name = 'base',
3-
srcs = [
4-
'command.js',
5-
'events.js',
6-
'promise.js',
7-
'stacktrace.js',
8-
],
9-
deps = [
10-
'//third_party/closure:closure',
11-
],
12-
visibility = [
13-
'//javascript/remote:client',
14-
'//javascript/safari-driver/...',
15-
],
16-
)
17-
18-
js_library(name = 'button',
19-
srcs = [
20-
'button.js',
21-
],
22-
)
23-
24-
js_library(name = 'capabilities',
25-
srcs = [
26-
'capabilities.js',
27-
],
28-
deps = [
29-
':logging',
30-
':serializable',
31-
],
32-
visibility = [
33-
'//javascript/safari-driver/...'
34-
],
35-
)
36-
37-
js_library(name = 'events',
38-
srcs = [
39-
'events.js',
40-
],
41-
)
42-
431
js_library(name = 'http',
44-
srcs = glob(['http/*.js']),
2+
srcs = glob([
3+
'capabilities.js',
4+
'command.js',
5+
'http/*.js',
6+
'logging.js',
7+
'session.js',
8+
]),
459
deps = [
46-
':base',
47-
':logging',
48-
':promise',
4910
'//javascript/atoms:errors',
5011
'//third_party/closure:closure',
5112
],
@@ -63,15 +24,6 @@ js_library(name = 'key',
6324
],
6425
)
6526

66-
js_library(name = 'locators',
67-
srcs = [
68-
'locators.js',
69-
],
70-
deps = [
71-
'//third_party/closure:closure',
72-
],
73-
)
74-
7527
js_library(name = 'logging',
7628
srcs = [
7729
'logging.js',
@@ -84,51 +36,6 @@ js_library(name = 'logging',
8436
],
8537
)
8638

87-
js_library(name = 'promise',
88-
srcs = [
89-
'promise.js',
90-
],
91-
deps = [
92-
':events',
93-
':stacktrace',
94-
'//third_party/closure:closure',
95-
],
96-
)
97-
98-
js_library(name = 'sequence',
99-
srcs = [
100-
'actionsequence.js',
101-
'touchsequence.js',
102-
],
103-
deps = [
104-
':base',
105-
':button',
106-
':key',
107-
'//third_party/closure:closure',
108-
],
109-
)
110-
111-
js_library(name = 'serializable',
112-
srcs = [
113-
'serializable.js',
114-
],
115-
deps = [
116-
],
117-
)
118-
119-
js_library(name = 'session',
120-
srcs = [
121-
'session.js',
122-
],
123-
deps = [
124-
':capabilities',
125-
],
126-
visibility = [
127-
'//javascript/remote:client',
128-
'//javascript/safari-driver/...'
129-
],
130-
)
131-
13239
js_library(name = 'stacktrace',
13340
srcs = [
13441
'stacktrace.js',
@@ -137,34 +44,3 @@ js_library(name = 'stacktrace',
13744
'//third_party/closure:closure',
13845
],
13946
)
140-
141-
js_library(name = 'until',
142-
srcs = [
143-
'until.js',
144-
],
145-
deps = [
146-
':locators',
147-
'//javascript/atoms:errors',
148-
'//third_party/closure:closure',
149-
],
150-
)
151-
152-
js_library(name = 'webdriver',
153-
srcs = [
154-
'webdriver.js',
155-
],
156-
deps = [
157-
':base',
158-
':key',
159-
':locators',
160-
':logging',
161-
':sequence',
162-
':session',
163-
':until',
164-
'//javascript/atoms:errors',
165-
'//third_party/closure:closure',
166-
],
167-
visibility = [
168-
'//javascript/safari-driver/...'
169-
],
170-
)

0 commit comments

Comments
 (0)