Download as
Browse Code »

Commit fc6ed495487084b051d7228fdafe814784ea3ea0

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

Update poltergeist and database_cleaner

Showing 2 changed files with 10 additions and 9 deletions   Show diff stats
@@ -187,7 +187,7 @@ group :development, :test do @@ -187,7 +187,7 @@ group :development, :test do
187 gem 'rb-inotify', require: linux_only('rb-inotify') 187 gem 'rb-inotify', require: linux_only('rb-inotify')
188 188
189 # PhantomJS driver for Capybara 189 # PhantomJS driver for Capybara
190 - gem 'poltergeist', '~> 1.3.0' 190 + gem 'poltergeist', '~> 1.4.1'
191 191
192 gem 'spork', '~> 1.0rc' 192 gem 'spork', '~> 1.0rc'
193 gem 'jasmine' 193 gem 'jasmine'
@@ -72,6 +72,7 @@ GEM @@ -72,6 +72,7 @@ GEM
72 railties (>= 3.0) 72 railties (>= 3.0)
73 sass-rails (>= 3.2) 73 sass-rails (>= 3.2)
74 chunky_png (1.2.8) 74 chunky_png (1.2.8)
  75 + cliver (0.2.1)
75 code_analyzer (0.3.2) 76 code_analyzer (0.3.2)
76 sexp_processor 77 sexp_processor
77 coderay (1.0.9) 78 coderay (1.0.9)
@@ -102,7 +103,7 @@ GEM @@ -102,7 +103,7 @@ GEM
102 d3_rails (3.1.10) 103 d3_rails (3.1.10)
103 railties (>= 3.1.0) 104 railties (>= 3.1.0)
104 daemons (1.1.9) 105 daemons (1.1.9)
105 - database_cleaner (1.0.1) 106 + database_cleaner (1.1.1)
106 debug_inspector (0.0.2) 107 debug_inspector (0.0.2)
107 descendants_tracker (0.0.1) 108 descendants_tracker (0.0.1)
108 devise (2.2.5) 109 devise (2.2.5)
@@ -132,8 +133,6 @@ GEM @@ -132,8 +133,6 @@ GEM
132 multipart-post (~> 1.1) 133 multipart-post (~> 1.1)
133 faraday_middleware (0.9.0) 134 faraday_middleware (0.9.0)
134 faraday (>= 0.7.4, < 0.9) 135 faraday (>= 0.7.4, < 0.9)
135 - faye-websocket (0.4.7)  
136 - eventmachine (>= 0.12.0)  
137 ffaker (1.16.1) 136 ffaker (1.16.1)
138 ffi (1.9.0) 137 ffi (1.9.0)
139 fog (1.3.1) 138 fog (1.3.1)
@@ -275,7 +274,7 @@ GEM @@ -275,7 +274,7 @@ GEM
275 mime-types (~> 1.16) 274 mime-types (~> 1.16)
276 treetop (~> 1.4.8) 275 treetop (~> 1.4.8)
277 method_source (0.8.1) 276 method_source (0.8.1)
278 - mime-types (1.23) 277 + mime-types (1.25)
279 minitest (4.7.4) 278 minitest (4.7.4)
280 modernizr (2.6.2) 279 modernizr (2.6.2)
281 sprockets (~> 2.0) 280 sprockets (~> 2.0)
@@ -315,10 +314,11 @@ GEM @@ -315,10 +314,11 @@ GEM
315 omniauth-oauth (~> 1.0) 314 omniauth-oauth (~> 1.0)
316 orm_adapter (0.4.0) 315 orm_adapter (0.4.0)
317 pg (0.15.1) 316 pg (0.15.1)
318 - poltergeist (1.3.0) 317 + poltergeist (1.4.1)
319 capybara (~> 2.1.0) 318 capybara (~> 2.1.0)
320 - faye-websocket (>= 0.4.4, < 0.5.0)  
321 - http_parser.rb (~> 0.5.3) 319 + cliver (~> 0.2.1)
  320 + multi_json (~> 1.0)
  321 + websocket-driver (>= 0.2.0)
322 polyglot (0.3.3) 322 polyglot (0.3.3)
323 posix-spawn (0.3.6) 323 posix-spawn (0.3.6)
324 pry (0.9.12.2) 324 pry (0.9.12.2)
@@ -534,6 +534,7 @@ GEM @@ -534,6 +534,7 @@ GEM
534 addressable (>= 2.2.7) 534 addressable (>= 2.2.7)
535 crack (>= 0.3.2) 535 crack (>= 0.3.2)
536 websocket (1.0.7) 536 websocket (1.0.7)
  537 + websocket-driver (0.3.0)
537 xpath (2.0.0) 538 xpath (2.0.0)
538 nokogiri (~> 1.3) 539 nokogiri (~> 1.3)
539 yajl-ruby (1.1.0) 540 yajl-ruby (1.1.0)
@@ -599,7 +600,7 @@ DEPENDENCIES @@ -599,7 +600,7 @@ DEPENDENCIES
599 omniauth-google-oauth2 600 omniauth-google-oauth2
600 omniauth-twitter 601 omniauth-twitter
601 pg 602 pg
602 - poltergeist (~> 1.3.0) 603 + poltergeist (~> 1.4.1)
603 pry 604 pry
604 quiet_assets (~> 1.0.1) 605 quiet_assets (~> 1.0.1)
605 rack-mini-profiler 606 rack-mini-profiler