Skip to content

Commit 1ed0272

Browse files
committed
Try latest esr Firefox with latest selenium-webdriver
1 parent fed5a9c commit 1ed0272

File tree

3 files changed

+68
-66
lines changed

3 files changed

+68
-66
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ language:
44
rvm:
55
- 2.3.1
66
addons:
7-
firefox: "49.0"
7+
firefox: "45.0"
88

99
before_script:
1010
- "export DISPLAY=:99.0"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ group :test do
6363
gem "capybara", "~> 2.4.3"
6464
gem "database_cleaner", "~> 1.3.0"
6565
gem "launchy", "~> 2.4.2"
66-
gem "selenium-webdriver", "~> 2.43.0"
66+
gem "selenium-webdriver", "~> 2.53.4"
6767
gem 'shoulda-matchers', '~> 2.6.2'
6868
end
6969

Gemfile.lock

Lines changed: 66 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ GEM
2727
minitest (~> 5.1)
2828
thread_safe (~> 0.1)
2929
tzinfo (~> 1.1)
30-
addressable (2.4.0)
30+
addressable (2.5.2)
31+
public_suffix (>= 2.0.2, < 4.0)
3132
arel (5.0.1.20140414130214)
3233
ast (2.3.0)
3334
bcrypt (3.1.11)
3435
bootstrap-sass (3.1.1.1)
3536
sass (~> 3.2)
36-
brakeman (3.3.5)
37+
brakeman (3.7.2)
3738
brakeman_translate_checkstyle_format (0.0.1)
3839
thor
39-
builder (3.2.2)
40+
builder (3.2.3)
4041
capybara (2.4.4)
4142
mime-types (>= 1.16)
4243
nokogiri (>= 1.3.3)
@@ -50,16 +51,16 @@ GEM
5051
ci_reporter_rspec (1.0.0)
5152
ci_reporter (~> 2.0)
5253
rspec (>= 2.14, < 4)
53-
coderay (1.1.1)
54+
coderay (1.1.2)
5455
coffee-rails (4.0.1)
5556
coffee-script (>= 2.2.0)
5657
railties (>= 4.0.0, < 5.0)
5758
coffee-script (2.4.1)
5859
coffee-script-source
5960
execjs
60-
coffee-script-source (1.10.0)
61+
coffee-script-source (1.12.2)
6162
database_cleaner (1.3.0)
62-
diff-lcs (1.2.5)
63+
diff-lcs (1.3)
6364
docile (1.1.5)
6465
erubis (2.7.0)
6566
execjs (2.7.0)
@@ -70,9 +71,9 @@ GEM
7071
railties (>= 3.0.0)
7172
faker (1.4.3)
7273
i18n (~> 0.5)
73-
ffi (1.9.14)
74+
ffi (1.9.18)
7475
formatador (0.2.5)
75-
guard (2.14.0)
76+
guard (2.14.1)
7677
formatador (>= 0.2.4)
7778
listen (>= 2.7, < 4.0)
7879
lumberjack (~> 1.0)
@@ -85,45 +86,45 @@ GEM
8586
guard (~> 2.1)
8687
rspec (>= 2.14, < 4.0)
8788
hike (1.2.3)
88-
i18n (0.7.0)
89-
jbuilder (2.6.0)
90-
activesupport (>= 3.0.0, < 5.1)
91-
multi_json (~> 1.2)
89+
i18n (0.8.6)
90+
jbuilder (2.6.4)
91+
activesupport (>= 3.0.0)
92+
multi_json (>= 1.2)
9293
jquery-rails (3.1.4)
9394
railties (>= 3.0, < 5.0)
9495
thor (>= 0.14, < 2.0)
95-
json (1.8.3)
96+
json (1.8.6)
9697
launchy (2.4.3)
9798
addressable (~> 2.3)
9899
listen (3.1.5)
99100
rb-fsevent (~> 0.9, >= 0.9.4)
100101
rb-inotify (~> 0.9, >= 0.9.7)
101102
ruby_dep (~> 1.2)
102-
lumberjack (1.0.10)
103-
mail (2.5.4)
103+
lumberjack (1.0.12)
104+
mail (2.5.5)
104105
mime-types (~> 1.16)
105106
treetop (~> 1.4.8)
106107
method_source (0.8.2)
107108
mime-types (1.25.1)
108-
mini_portile2 (2.1.0)
109-
minitest (5.9.0)
110-
multi_json (1.12.1)
109+
mini_portile2 (2.2.0)
110+
minitest (5.10.3)
111+
multi_json (1.12.2)
111112
nenv (0.3.0)
112-
nokogiri (1.6.8)
113-
mini_portile2 (~> 2.1.0)
114-
pkg-config (~> 1.1.7)
113+
nokogiri (1.8.0)
114+
mini_portile2 (~> 2.2.0)
115115
notiffany (0.1.1)
116116
nenv (~> 0.1)
117117
shellany (~> 0.0)
118-
parser (2.3.1.2)
118+
parallel (1.12.0)
119+
parser (2.4.0.0)
119120
ast (~> 2.2)
120-
pkg-config (1.1.7)
121121
polyglot (0.3.5)
122122
powerpack (0.1.1)
123123
pry (0.10.4)
124124
coderay (~> 1.1.0)
125125
method_source (~> 0.8.1)
126126
slop (~> 3.4)
127+
public_suffix (3.0.0)
127128
rack (1.5.5)
128129
rack-test (0.6.3)
129130
rack (>= 1.0)
@@ -142,67 +143,68 @@ GEM
142143
activesupport (= 4.1.1)
143144
rake (>= 0.8.7)
144145
thor (>= 0.18.1, < 2.0)
145-
rainbow (2.1.0)
146-
rake (11.2.2)
147-
rb-fsevent (0.9.7)
148-
rb-inotify (0.9.7)
149-
ffi (>= 0.5.0)
150-
rdoc (4.2.2)
151-
json (~> 1.4)
152-
rspec (3.5.0)
153-
rspec-core (~> 3.5.0)
154-
rspec-expectations (~> 3.5.0)
155-
rspec-mocks (~> 3.5.0)
156-
rspec-core (3.5.2)
157-
rspec-support (~> 3.5.0)
158-
rspec-expectations (3.5.0)
146+
rainbow (2.2.2)
147+
rake
148+
rake (12.0.0)
149+
rb-fsevent (0.10.2)
150+
rb-inotify (0.9.10)
151+
ffi (>= 0.5.0, < 2)
152+
rdoc (4.3.0)
153+
rspec (3.6.0)
154+
rspec-core (~> 3.6.0)
155+
rspec-expectations (~> 3.6.0)
156+
rspec-mocks (~> 3.6.0)
157+
rspec-core (3.6.0)
158+
rspec-support (~> 3.6.0)
159+
rspec-expectations (3.6.0)
159160
diff-lcs (>= 1.2.0, < 2.0)
160-
rspec-support (~> 3.5.0)
161-
rspec-mocks (3.5.0)
161+
rspec-support (~> 3.6.0)
162+
rspec-mocks (3.6.0)
162163
diff-lcs (>= 1.2.0, < 2.0)
163-
rspec-support (~> 3.5.0)
164-
rspec-rails (3.5.2)
164+
rspec-support (~> 3.6.0)
165+
rspec-rails (3.6.1)
165166
actionpack (>= 3.0)
166167
activesupport (>= 3.0)
167168
railties (>= 3.0)
168-
rspec-core (~> 3.5.0)
169-
rspec-expectations (~> 3.5.0)
170-
rspec-mocks (~> 3.5.0)
171-
rspec-support (~> 3.5.0)
172-
rspec-support (3.5.0)
173-
rubocop (0.42.0)
174-
parser (>= 2.3.1.1, < 3.0)
169+
rspec-core (~> 3.6.0)
170+
rspec-expectations (~> 3.6.0)
171+
rspec-mocks (~> 3.6.0)
172+
rspec-support (~> 3.6.0)
173+
rspec-support (3.6.0)
174+
rubocop (0.49.1)
175+
parallel (~> 1.10)
176+
parser (>= 2.3.3.1, < 3.0)
175177
powerpack (~> 0.1)
176178
rainbow (>= 1.99.1, < 3.0)
177179
ruby-progressbar (~> 1.7)
178180
unicode-display_width (~> 1.0, >= 1.0.1)
179181
ruby-progressbar (1.8.1)
180-
ruby_dep (1.4.0)
182+
ruby_dep (1.5.0)
181183
rubyzip (1.2.1)
182184
sass (3.2.19)
183185
sass-rails (4.0.5)
184186
railties (>= 4.0.0, < 5.0)
185187
sass (~> 3.2.2)
186188
sprockets (~> 2.8, < 3.0)
187189
sprockets-rails (~> 2.0)
188-
sdoc (0.4.1)
190+
sdoc (0.4.2)
189191
json (~> 1.7, >= 1.7.7)
190192
rdoc (~> 4.0)
191-
selenium-webdriver (2.43.0)
193+
selenium-webdriver (2.53.4)
192194
childprocess (~> 0.5)
193-
multi_json (~> 1.0)
194195
rubyzip (~> 1.0)
195196
websocket (~> 1.0)
196197
shellany (0.0.1)
197198
shoulda-matchers (2.6.2)
198199
activesupport (>= 3.0.0)
199-
simplecov (0.12.0)
200+
simplecov (0.15.0)
200201
docile (~> 1.1.0)
201202
json (>= 1.8, < 3)
202203
simplecov-html (~> 0.10.0)
203-
simplecov-cobertura (1.1.0)
204+
simplecov-cobertura (1.2.0)
205+
json (~> 1.8)
204206
simplecov (~> 0.8)
205-
simplecov-html (0.10.0)
207+
simplecov-html (0.10.2)
206208
slop (3.6.0)
207209
spring (1.7.2)
208210
spring-commands-rspec (1.0.4)
@@ -216,23 +218,23 @@ GEM
216218
actionpack (>= 3.0)
217219
activesupport (>= 3.0)
218220
sprockets (>= 2.8, < 4.0)
219-
sqlite3 (1.3.11)
220-
thor (0.19.1)
221-
thread_safe (0.3.5)
221+
sqlite3 (1.3.13)
222+
thor (0.20.0)
223+
thread_safe (0.3.6)
222224
tilt (1.4.1)
223225
treetop (1.4.15)
224226
polyglot
225227
polyglot (>= 0.3.1)
226228
turbolinks (5.0.1)
227229
turbolinks-source (~> 5)
228-
turbolinks-source (5.0.0)
229-
tzinfo (1.2.2)
230+
turbolinks-source (5.0.3)
231+
tzinfo (1.2.3)
230232
thread_safe (~> 0.1)
231-
uglifier (3.0.2)
233+
uglifier (3.2.0)
232234
execjs (>= 0.3.0, < 3)
233-
unicode-display_width (1.1.0)
235+
unicode-display_width (1.3.0)
234236
websocket (1.2.4)
235-
xpath (2.0.0)
237+
xpath (2.1.0)
236238
nokogiri (~> 1.3)
237239

238240
PLATFORMS
@@ -258,7 +260,7 @@ DEPENDENCIES
258260
rubocop
259261
sass-rails (~> 4.0.3)
260262
sdoc (~> 0.4.0)
261-
selenium-webdriver (~> 2.43.0)
263+
selenium-webdriver (~> 2.53.4)
262264
shoulda-matchers (~> 2.6.2)
263265
simplecov
264266
simplecov-cobertura

0 commit comments

Comments
 (0)