Download as
Browse Code »

Commit 830da0c2181eee0b65d7e51d1e2854580cc9d76a

Authored by Dmitriy Zaporozhets
1 parent af3138e8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update capybara, poltergeist, spinach, rspec-rails

Showing 2 changed files with 28 additions and 38 deletions   Show diff stats
@@ -134,9 +134,9 @@ end @@ -134,9 +134,9 @@ end
134 134
135 group :development, :test do 135 group :development, :test do
136 gem 'rails-dev-tweaks' 136 gem 'rails-dev-tweaks'
137 - gem 'spinach-rails'  
138 - gem "rspec-rails"  
139 - gem "capybara" 137 + gem 'spinach-rails', '0.2.0'
  138 + gem "rspec-rails", '2.12.2'
  139 + gem "capybara", '2.0.2'
140 gem "pry" 140 gem "pry"
141 gem "awesome_print" 141 gem "awesome_print"
142 gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git" 142 gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git"
@@ -153,7 +153,7 @@ group :development, :test do @@ -153,7 +153,7 @@ group :development, :test do
153 gem 'rb-inotify', require: linux_only('rb-inotify') 153 gem 'rb-inotify', require: linux_only('rb-inotify')
154 154
155 # PhantomJS driver for Capybara 155 # PhantomJS driver for Capybara
156 - gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist.git', ref: '5c2e092001074a8cf09f332d3714e9ba150bc8ca' 156 + gem 'poltergeist', '1.1.0'
157 end 157 end
158 158
159 group :test do 159 group :test do
@@ -54,18 +54,6 @@ GIT @@ -54,18 +54,6 @@ GIT
54 specs: 54 specs:
55 raphael-rails (2.1.0) 55 raphael-rails (2.1.0)
56 56
57 -GIT  
58 - remote: https://github.com/jonleighton/poltergeist.git  
59 - revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca  
60 - ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca  
61 - specs:  
62 - poltergeist (1.0.2)  
63 - capybara (~> 1.1)  
64 - childprocess (~> 0.3)  
65 - faye-websocket (~> 0.4, >= 0.4.4)  
66 - http_parser.rb (~> 0.5.3)  
67 - multi_json (~> 1.0)  
68 -  
69 GEM 57 GEM
70 remote: http://rubygems.org/ 58 remote: http://rubygems.org/
71 specs: 59 specs:
@@ -110,13 +98,13 @@ GEM @@ -110,13 +98,13 @@ GEM
110 bootstrap-sass (2.2.1.1) 98 bootstrap-sass (2.2.1.1)
111 sass (~> 3.2) 99 sass (~> 3.2)
112 builder (3.0.4) 100 builder (3.0.4)
113 - capybara (1.1.3) 101 + capybara (2.0.2)
114 mime-types (>= 1.16) 102 mime-types (>= 1.16)
115 nokogiri (>= 1.3.3) 103 nokogiri (>= 1.3.3)
116 rack (>= 1.0.0) 104 rack (>= 1.0.0)
117 rack-test (>= 0.5.4) 105 rack-test (>= 0.5.4)
118 selenium-webdriver (~> 2.0) 106 selenium-webdriver (~> 2.0)
119 - xpath (~> 0.1.4) 107 + xpath (~> 1.0.0)
120 carrierwave (0.7.1) 108 carrierwave (0.7.1)
121 activemodel (>= 3.2.0) 109 activemodel (>= 3.2.0)
122 activesupport (>= 3.2.0) 110 activesupport (>= 3.2.0)
@@ -124,8 +112,8 @@ GEM @@ -124,8 +112,8 @@ GEM
124 facter (>= 1.6.12) 112 facter (>= 1.6.12)
125 timers (>= 1.0.0) 113 timers (>= 1.0.0)
126 charlock_holmes (0.6.9) 114 charlock_holmes (0.6.9)
127 - childprocess (0.3.6)  
128 - ffi (~> 1.0, >= 1.0.6) 115 + childprocess (0.3.8)
  116 + ffi (~> 1.0, >= 1.0.11)
129 chosen-rails (0.9.8) 117 chosen-rails (0.9.8)
130 railties (~> 3.0) 118 railties (~> 3.0)
131 thor (~> 0.14) 119 thor (~> 0.14)
@@ -169,10 +157,10 @@ GEM @@ -169,10 +157,10 @@ GEM
169 railties (>= 3.0.0) 157 railties (>= 3.0.0)
170 faraday (0.8.4) 158 faraday (0.8.4)
171 multipart-post (~> 1.1) 159 multipart-post (~> 1.1)
172 - faye-websocket (0.4.6) 160 + faye-websocket (0.4.7)
173 eventmachine (>= 0.12.0) 161 eventmachine (>= 0.12.0)
174 ffaker (1.15.0) 162 ffaker (1.15.0)
175 - ffi (1.1.5) 163 + ffi (1.4.0)
176 font-awesome-sass-rails (3.0.0.1) 164 font-awesome-sass-rails (3.0.0.1)
177 railties (>= 3.1.1) 165 railties (>= 3.1.1)
178 sass-rails (>= 3.1.1) 166 sass-rails (>= 3.1.1)
@@ -249,8 +237,6 @@ GEM @@ -249,8 +237,6 @@ GEM
249 letter_opener (1.0.0) 237 letter_opener (1.0.0)
250 launchy (>= 2.0.4) 238 launchy (>= 2.0.4)
251 libv8 (3.3.10.4) 239 libv8 (3.3.10.4)
252 - libwebsocket (0.1.6)  
253 - websocket  
254 listen (0.5.3) 240 listen (0.5.3)
255 lumberjack (1.0.2) 241 lumberjack (1.0.2)
256 mail (2.4.4) 242 mail (2.4.4)
@@ -261,12 +247,12 @@ GEM @@ -261,12 +247,12 @@ GEM
261 mime-types (1.21) 247 mime-types (1.21)
262 modernizr (2.6.2) 248 modernizr (2.6.2)
263 sprockets (~> 2.0) 249 sprockets (~> 2.0)
264 - multi_json (1.5.1) 250 + multi_json (1.6.1)
265 multi_xml (0.5.1) 251 multi_xml (0.5.1)
266 multipart-post (1.1.5) 252 multipart-post (1.1.5)
267 mysql2 (0.3.11) 253 mysql2 (0.3.11)
268 net-ldap (0.2.2) 254 net-ldap (0.2.2)
269 - nokogiri (1.5.5) 255 + nokogiri (1.5.6)
270 oauth (0.4.7) 256 oauth (0.4.7)
271 oauth2 (0.8.0) 257 oauth2 (0.8.0)
272 faraday (~> 0.8) 258 faraday (~> 0.8)
@@ -294,6 +280,10 @@ GEM @@ -294,6 +280,10 @@ GEM
294 omniauth-oauth (~> 1.0) 280 omniauth-oauth (~> 1.0)
295 orm_adapter (0.4.0) 281 orm_adapter (0.4.0)
296 pg (0.14.1) 282 pg (0.14.1)
  283 + poltergeist (1.1.0)
  284 + capybara (~> 2.0, >= 2.0.1)
  285 + faye-websocket (~> 0.4, >= 0.4.4)
  286 + http_parser.rb (~> 0.5.3)
297 polyglot (0.3.3) 287 polyglot (0.3.3)
298 posix-spawn (0.3.6) 288 posix-spawn (0.3.6)
299 progressbar (0.12.0) 289 progressbar (0.12.0)
@@ -364,7 +354,7 @@ GEM @@ -364,7 +354,7 @@ GEM
364 rspec-expectations (2.12.0) 354 rspec-expectations (2.12.0)
365 diff-lcs (~> 1.1.3) 355 diff-lcs (~> 1.1.3)
366 rspec-mocks (2.12.0) 356 rspec-mocks (2.12.0)
367 - rspec-rails (2.12.0) 357 + rspec-rails (2.12.2)
368 actionpack (>= 3.0) 358 actionpack (>= 3.0)
369 activesupport (>= 3.0) 359 activesupport (>= 3.0)
370 railties (>= 3.0) 360 railties (>= 3.0)
@@ -384,11 +374,11 @@ GEM @@ -384,11 +374,11 @@ GEM
384 seed-fu (2.2.0) 374 seed-fu (2.2.0)
385 activerecord (~> 3.1) 375 activerecord (~> 3.1)
386 activesupport (~> 3.1) 376 activesupport (~> 3.1)
387 - selenium-webdriver (2.26.0) 377 + selenium-webdriver (2.30.0)
388 childprocess (>= 0.2.5) 378 childprocess (>= 0.2.5)
389 - libwebsocket (~> 0.1.3)  
390 multi_json (~> 1.0) 379 multi_json (~> 1.0)
391 rubyzip 380 rubyzip
  381 + websocket (~> 1.0.4)
392 settingslogic (2.0.8) 382 settingslogic (2.0.8)
393 sexp_processor (4.1.3) 383 sexp_processor (4.1.3)
394 shoulda-matchers (1.3.0) 384 shoulda-matchers (1.3.0)
@@ -412,11 +402,11 @@ GEM @@ -412,11 +402,11 @@ GEM
412 temple (~> 0.5.5) 402 temple (~> 0.5.5)
413 tilt (~> 1.3.3) 403 tilt (~> 1.3.3)
414 slop (3.3.3) 404 slop (3.3.3)
415 - spinach (0.5.2) 405 + spinach (0.7.0)
416 colorize 406 colorize
417 gherkin-ruby (~> 0.2.0) 407 gherkin-ruby (~> 0.2.0)
418 - spinach-rails (0.1.8)  
419 - capybara (~> 1) 408 + spinach-rails (0.2.0)
  409 + capybara (~> 2.0.0)
420 railties (>= 3) 410 railties (>= 3)
421 spinach (>= 0.4) 411 spinach (>= 0.4)
422 sprockets (2.2.2) 412 sprockets (2.2.2)
@@ -455,8 +445,8 @@ GEM @@ -455,8 +445,8 @@ GEM
455 webmock (1.9.0) 445 webmock (1.9.0)
456 addressable (>= 2.2.7) 446 addressable (>= 2.2.7)
457 crack (>= 0.1.7) 447 crack (>= 0.1.7)
458 - websocket (1.0.2)  
459 - xpath (0.1.4) 448 + websocket (1.0.7)
  449 + xpath (1.0.0)
460 nokogiri (~> 1.3) 450 nokogiri (~> 1.3)
461 yajl-ruby (1.1.0) 451 yajl-ruby (1.1.0)
462 452
@@ -470,7 +460,7 @@ DEPENDENCIES @@ -470,7 +460,7 @@ DEPENDENCIES
470 better_errors 460 better_errors
471 binding_of_caller 461 binding_of_caller
472 bootstrap-sass (= 2.2.1.1) 462 bootstrap-sass (= 2.2.1.1)
473 - capybara 463 + capybara (= 2.0.2)
474 carrierwave (~> 0.7.1) 464 carrierwave (~> 0.7.1)
475 chosen-rails (= 0.9.8) 465 chosen-rails (= 0.9.8)
476 coffee-rails (~> 3.2.2) 466 coffee-rails (~> 3.2.2)
@@ -512,7 +502,7 @@ DEPENDENCIES @@ -512,7 +502,7 @@ DEPENDENCIES
512 omniauth-google-oauth2 502 omniauth-google-oauth2
513 omniauth-twitter 503 omniauth-twitter
514 pg 504 pg
515 - poltergeist! 505 + poltergeist (= 1.1.0)
516 pry 506 pry
517 pygments.rb! 507 pygments.rb!
518 quiet_assets (~> 1.0.1) 508 quiet_assets (~> 1.0.1)
@@ -524,7 +514,7 @@ DEPENDENCIES @@ -524,7 +514,7 @@ DEPENDENCIES
524 rb-fsevent 514 rb-fsevent
525 rb-inotify 515 rb-inotify
526 redcarpet (~> 2.2.2) 516 redcarpet (~> 2.2.2)
527 - rspec-rails 517 + rspec-rails (= 2.12.2)
528 sass-rails (~> 3.2.5) 518 sass-rails (~> 3.2.5)
529 sdoc 519 sdoc
530 seed-fu 520 seed-fu
@@ -535,7 +525,7 @@ DEPENDENCIES @@ -535,7 +525,7 @@ DEPENDENCIES
535 sinatra 525 sinatra
536 six 526 six
537 slim 527 slim
538 - spinach-rails 528 + spinach-rails (= 0.2.0)
539 stamp 529 stamp
540 state_machine 530 state_machine
541 test_after_commit 531 test_after_commit