Skip to content

Commit 344707e

Browse files
ArdescoArdesco
committed
Fix #36 Update expected filenames for Marionette. We now only support binaries for Marionette v0.7.1 onwards
Update RepositoryMap.xml to latest versions of driver binaries.
1 parent eafe67f commit 344707e

File tree

6 files changed

+100
-67
lines changed

6 files changed

+100
-67
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Thumbs.db
4242

4343
# Maven #
4444
#########
45-
*/target/*
45+
**/target/*
4646

4747
# Other IDE's#
4848
##############

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
##Next Version (Release Date TBC) Release Notes
44

5+
##Version 1.10.0 Release Notes
6+
7+
* Fix #36 Change expected filenames for Marionette binaries. We now support Marionette binaries version 0.7.1 onwards. If you are using earlier binary versions things will break for you.
8+
9+
##Version 1.0.9 Release Notes
10+
511
* Update default RepositoryMap.xml to latest binary versions
612
* Fix #29 Clean up logging to make it clearer when file is downloaded, and when an existing file is used
713
* Fix #34 Add support for wires (Marionette) binaries.

‎README.md‎

Lines changed: 44 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,24 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
124124
<root>
125125
<windows>
126126
<driver id="internetexplorer">
127-
<version id="2.52.0">
127+
<version id="2.53.1">
128128
<bitrate sixtyfourbit="true">
129-
<filelocation>http://selenium-release.storage.googleapis.com/2.52/IEDriverServer_x64_2.52.0.zip</filelocation>
130-
<hash>c850d584bc647a52c1c1311c233c68d4ac9f1ac8</hash>
129+
<filelocation>http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_x64_2.53.1.zip</filelocation>
130+
<hash>8bb35310de86b4dd58915a5f430d4ccab1266698</hash>
131131
<hashtype>sha1</hashtype>
132132
</bitrate>
133133
<bitrate thirtytwobit="true">
134-
<filelocation>http://selenium-release.storage.googleapis.com/2.52/IEDriverServer_Win32_2.52.0.zip</filelocation>
135-
<hash>55bbe45c5ebfdb66edc6502afd05a2342183ebb9</hash>
134+
<filelocation>http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_Win32_2.53.1.zip</filelocation>
135+
<hash>ecd2d40f6b9b50e18903fd4c0ad286939bfd04a7</hash>
136136
<hashtype>sha1</hashtype>
137137
</bitrate>
138138
</version>
139139
</driver>
140140
<driver id="googlechrome">
141-
<version id="2.21">
141+
<version id="2.23">
142142
<bitrate thirtytwobit="true" sixtyfourbit="true">
143-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_win32.zip</filelocation>
144-
<hash>2ee59a8047ec345f886d5b90656dbea1469b7e44</hash>
143+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_win32.zip</filelocation>
144+
<hash>847bf2497eab7aac5cf0622e49939f976087aae4</hash>
145145
<hashtype>sha1</hashtype>
146146
</bitrate>
147147
</version>
@@ -161,10 +161,10 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
161161
</version>
162162
</driver>
163163
<driver id="phantomjs">
164-
<version id="2.0.0">
164+
<version id="2.1.1">
165165
<bitrate thirtytwobit="true" sixtyfourbit="true">
166-
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-windows.zip</filelocation>
167-
<hash>ca0c753e5d8820a271dd7c2d6a9fad6ff86fb09f</hash>
166+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-windows.zip</filelocation>
167+
<hash>eb61e6dc49832a3d60f708a92fa7299c57cad7db</hash>
168168
<hashtype>sha1</hashtype>
169169
</bitrate>
170170
</version>
@@ -177,26 +177,26 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
177177
</version>
178178
</driver>
179179
<driver id="marionette">
180-
<version id="0.6.2">
181-
<bitrate thirtytwobit="true" sixtyfourbit="true">
182-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-win.zip</filelocation>
183-
<hash>20a0eca607edd98392e0590a5a307ef56526647e</hash>
180+
<version id="0.10.0">
181+
<bitrate sixtyfourbit="true">
182+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-win64.zip</filelocation>
183+
<hash>babc51b39da6f9a090c3c0e3ab9e800086f6140c</hash>
184184
<hashtype>sha1</hashtype>
185185
</bitrate>
186186
</version>
187187
</driver>
188188
</windows>
189189
<linux>
190190
<driver id="googlechrome">
191-
<version id="2.21">
191+
<version id="2.23">
192192
<bitrate sixtyfourbit="true">
193-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip</filelocation>
194-
<hash>7be5d5c58fa826147aa83aa61c7fb0d8ca94805b</hash>
193+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_linux64.zip</filelocation>
194+
<hash>917f9e939e816c4f4487b2ebfddb21ecc77a4a9c</hash>
195195
<hashtype>sha1</hashtype>
196196
</bitrate>
197197
<bitrate thirtytwobit="true">
198-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux32.zip</filelocation>
199-
<hash>f783f76e06db305f10df0d307abc4ab3e9b0d998</hash>
198+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_linux32.zip</filelocation>
199+
<hash>b4bc392b16a62988cf0aa8e609e7edcc7a13ecc8</hash>
200200
<hashtype>sha1</hashtype>
201201
</bitrate>
202202
</version>
@@ -216,6 +216,18 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
216216
</version>
217217
</driver>
218218
<driver id="phantomjs">
219+
<version id="2.1.1">
220+
<bitrate sixtyfourbit="true">
221+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2</filelocation>
222+
<hash>f8afc8a24eec34c2badccc93812879a3d6f2caf3</hash>
223+
<hashtype>sha1</hashtype>
224+
</bitrate>
225+
<bitrate thirtytwobit="true">
226+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-i686.tar.bz2</filelocation>
227+
<hash>9870663f5c2826501508972b8a201d9210d27b59</hash>
228+
<hashtype>sha1</hashtype>
229+
</bitrate>
230+
</version>
219231
<version id="1.9.8">
220232
<bitrate sixtyfourbit="true">
221233
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2</filelocation>
@@ -230,21 +242,21 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
230242
</version>
231243
</driver>
232244
<driver id="marionette">
233-
<version id="0.6.2">
245+
<version id="0.10.0">
234246
<bitrate sixtyfourbit="true">
235-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-linux64.gz</filelocation>
236-
<hash>0adc84131607057ca37d42426798bff99faafb56</hash>
247+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-linux64.tar.gz</filelocation>
248+
<hash>7dd33d2779aedaca41f94dee2f1db6a25d9230a2</hash>
237249
<hashtype>sha1</hashtype>
238250
</bitrate>
239251
</version>
240252
</driver>
241253
</linux>
242254
<osx>
243255
<driver id="googlechrome">
244-
<version id="2.21">
256+
<version id="2.23">
245257
<bitrate thirtytwobit="true" sixtyfourbit="true">
246-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_mac32.zip</filelocation>
247-
<hash>49afcd80ab445c3085f8012180f7579b90afb364</hash>
258+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_mac32.zip</filelocation>
259+
<hash>8343cb5ed784c1c23c90ecfa86da0dc058d68c89</hash>
248260
<hashtype>sha1</hashtype>
249261
</bitrate>
250262
</version>
@@ -259,10 +271,10 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
259271
</version>
260272
</driver>
261273
<driver id="phantomjs">
262-
<version id="2.0.0">
274+
<version id="2.1.1">
263275
<bitrate thirtytwobit="true" sixtyfourbit="true">
264-
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-macosx.zip</filelocation>
265-
<hash>97f87188bb2fc81e0c57ec3a376b722e3bcc30c9</hash>
276+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip</filelocation>
277+
<hash>c6e1a16bb9e89ce1e392a4768e99177797c93350</hash>
266278
<hashtype>sha1</hashtype>
267279
</bitrate>
268280
</version>
@@ -275,10 +287,10 @@ ___Below is an example RepositoryMap.xml that I will endeavour to keep up to dat
275287
</version>
276288
</driver>
277289
<driver id="marionette">
278-
<version id="0.6.2">
290+
<version id="0.10.0">
279291
<bitrate thirtytwobit="true" sixtyfourbit="true">
280-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-OSX.gz</filelocation>
281-
<hash>2efc475bcc736d0502fb09051932e63052e98c4e</hash>
292+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-macos.tar.gz</filelocation>
293+
<hash>ca22ac7a159bc81f2e2f35fd29ccd6693a81b763</hash>
282294
<hashtype>sha1</hashtype>
283295
</bitrate>
284296
</version>

‎src/main/java/com/lazerycode/selenium/extract/FileExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ protected String untarFile(InputStream compressedFileInputStream, String extract
130130
/**
131131
* Copy a file from an inputsteam to disk
132132
*
133-
* @param inputStream A valid iput stream to read
133+
* @param inputStream A valid input stream to read
134134
* @param pathToExtractTo Path of the file we want to create
135135
* @param filename Filename of the file we want to create
136136
* @return Absolute path of the newly created file (Or existing file if overwriteFilesThatExist is set to false)

‎src/main/java/com/lazerycode/selenium/repository/BinaryType.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public enum BinaryType {
2828
"webdriver.opera.driver"),
2929
MARIONETTE(
3030
new ArrayList<String>() {{
31-
add("wires.*");
31+
add("wires");
32+
add("wires.exe");
33+
add("geckodriver");
34+
add("geckodriver.exe");
3235
}},
3336
"webdriver.gecko.driver");
3437

‎src/main/resources/RepositoryMap.xml‎

Lines changed: 44 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
<root>
33
<windows>
44
<driver id="internetexplorer">
5-
<version id="2.52.0">
5+
<version id="2.53.1">
66
<bitrate sixtyfourbit="true">
7-
<filelocation>http://selenium-release.storage.googleapis.com/2.52/IEDriverServer_x64_2.52.0.zip</filelocation>
8-
<hash>c850d584bc647a52c1c1311c233c68d4ac9f1ac8</hash>
7+
<filelocation>http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_x64_2.53.1.zip</filelocation>
8+
<hash>8bb35310de86b4dd58915a5f430d4ccab1266698</hash>
99
<hashtype>sha1</hashtype>
1010
</bitrate>
1111
<bitrate thirtytwobit="true">
12-
<filelocation>http://selenium-release.storage.googleapis.com/2.52/IEDriverServer_Win32_2.52.0.zip</filelocation>
13-
<hash>55bbe45c5ebfdb66edc6502afd05a2342183ebb9</hash>
12+
<filelocation>http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_Win32_2.53.1.zip</filelocation>
13+
<hash>ecd2d40f6b9b50e18903fd4c0ad286939bfd04a7</hash>
1414
<hashtype>sha1</hashtype>
1515
</bitrate>
1616
</version>
1717
</driver>
1818
<driver id="googlechrome">
19-
<version id="2.21">
19+
<version id="2.23">
2020
<bitrate thirtytwobit="true" sixtyfourbit="true">
21-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_win32.zip</filelocation>
22-
<hash>2ee59a8047ec345f886d5b90656dbea1469b7e44</hash>
21+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_win32.zip</filelocation>
22+
<hash>847bf2497eab7aac5cf0622e49939f976087aae4</hash>
2323
<hashtype>sha1</hashtype>
2424
</bitrate>
2525
</version>
@@ -39,10 +39,10 @@
3939
</version>
4040
</driver>
4141
<driver id="phantomjs">
42-
<version id="2.0.0">
42+
<version id="2.1.1">
4343
<bitrate thirtytwobit="true" sixtyfourbit="true">
44-
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-windows.zip</filelocation>
45-
<hash>ca0c753e5d8820a271dd7c2d6a9fad6ff86fb09f</hash>
44+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-windows.zip</filelocation>
45+
<hash>eb61e6dc49832a3d60f708a92fa7299c57cad7db</hash>
4646
<hashtype>sha1</hashtype>
4747
</bitrate>
4848
</version>
@@ -55,26 +55,26 @@
5555
</version>
5656
</driver>
5757
<driver id="marionette">
58-
<version id="0.6.2">
59-
<bitrate thirtytwobit="true" sixtyfourbit="true">
60-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-win.zip</filelocation>
61-
<hash>20a0eca607edd98392e0590a5a307ef56526647e</hash>
58+
<version id="0.10.0">
59+
<bitrate sixtyfourbit="true">
60+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-win64.zip</filelocation>
61+
<hash>babc51b39da6f9a090c3c0e3ab9e800086f6140c</hash>
6262
<hashtype>sha1</hashtype>
6363
</bitrate>
6464
</version>
6565
</driver>
6666
</windows>
6767
<linux>
6868
<driver id="googlechrome">
69-
<version id="2.21">
69+
<version id="2.23">
7070
<bitrate sixtyfourbit="true">
71-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip</filelocation>
72-
<hash>7be5d5c58fa826147aa83aa61c7fb0d8ca94805b</hash>
71+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_linux64.zip</filelocation>
72+
<hash>917f9e939e816c4f4487b2ebfddb21ecc77a4a9c</hash>
7373
<hashtype>sha1</hashtype>
7474
</bitrate>
7575
<bitrate thirtytwobit="true">
76-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux32.zip</filelocation>
77-
<hash>f783f76e06db305f10df0d307abc4ab3e9b0d998</hash>
76+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_linux32.zip</filelocation>
77+
<hash>b4bc392b16a62988cf0aa8e609e7edcc7a13ecc8</hash>
7878
<hashtype>sha1</hashtype>
7979
</bitrate>
8080
</version>
@@ -94,6 +94,18 @@
9494
</version>
9595
</driver>
9696
<driver id="phantomjs">
97+
<version id="2.1.1">
98+
<bitrate sixtyfourbit="true">
99+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2</filelocation>
100+
<hash>f8afc8a24eec34c2badccc93812879a3d6f2caf3</hash>
101+
<hashtype>sha1</hashtype>
102+
</bitrate>
103+
<bitrate thirtytwobit="true">
104+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-i686.tar.bz2</filelocation>
105+
<hash>9870663f5c2826501508972b8a201d9210d27b59</hash>
106+
<hashtype>sha1</hashtype>
107+
</bitrate>
108+
</version>
97109
<version id="1.9.8">
98110
<bitrate sixtyfourbit="true">
99111
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2</filelocation>
@@ -108,21 +120,21 @@
108120
</version>
109121
</driver>
110122
<driver id="marionette">
111-
<version id="0.6.2">
123+
<version id="0.10.0">
112124
<bitrate sixtyfourbit="true">
113-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-linux64.gz</filelocation>
114-
<hash>0adc84131607057ca37d42426798bff99faafb56</hash>
125+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-linux64.tar.gz</filelocation>
126+
<hash>7dd33d2779aedaca41f94dee2f1db6a25d9230a2</hash>
115127
<hashtype>sha1</hashtype>
116128
</bitrate>
117129
</version>
118130
</driver>
119131
</linux>
120132
<osx>
121133
<driver id="googlechrome">
122-
<version id="2.21">
134+
<version id="2.23">
123135
<bitrate thirtytwobit="true" sixtyfourbit="true">
124-
<filelocation>http://chromedriver.storage.googleapis.com/2.21/chromedriver_mac32.zip</filelocation>
125-
<hash>49afcd80ab445c3085f8012180f7579b90afb364</hash>
136+
<filelocation>http://chromedriver.storage.googleapis.com/2.23/chromedriver_mac32.zip</filelocation>
137+
<hash>8343cb5ed784c1c23c90ecfa86da0dc058d68c89</hash>
126138
<hashtype>sha1</hashtype>
127139
</bitrate>
128140
</version>
@@ -137,10 +149,10 @@
137149
</version>
138150
</driver>
139151
<driver id="phantomjs">
140-
<version id="2.0.0">
152+
<version id="2.1.1">
141153
<bitrate thirtytwobit="true" sixtyfourbit="true">
142-
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-macosx.zip</filelocation>
143-
<hash>97f87188bb2fc81e0c57ec3a376b722e3bcc30c9</hash>
154+
<filelocation>https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip</filelocation>
155+
<hash>c6e1a16bb9e89ce1e392a4768e99177797c93350</hash>
144156
<hashtype>sha1</hashtype>
145157
</bitrate>
146158
</version>
@@ -153,10 +165,10 @@
153165
</version>
154166
</driver>
155167
<driver id="marionette">
156-
<version id="0.6.2">
168+
<version id="0.10.0">
157169
<bitrate thirtytwobit="true" sixtyfourbit="true">
158-
<filelocation>https://github.com/jgraham/wires/releases/download/v0.6.2/wires-0.6.2-OSX.gz</filelocation>
159-
<hash>2efc475bcc736d0502fb09051932e63052e98c4e</hash>
170+
<filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-macos.tar.gz</filelocation>
171+
<hash>ca22ac7a159bc81f2e2f35fd29ccd6693a81b763</hash>
160172
<hashtype>sha1</hashtype>
161173
</bitrate>
162174
</version>

0 commit comments

Comments
 (0)