Commit e8e0f70b23f9dd3f072119e5e1568480d247cc93

Authored by Cyril Mougel
1 parent 3b6c90a6
Exists in master and in 1 other branch production

fix capybara to < 2.1.0 version because not compatible to 1.8.7 ruby version

Showing 2 changed files with 17 additions and 5 deletions   Show diff stats
@@ -101,7 +101,8 @@ group :development do @@ -101,7 +101,8 @@ group :development do
101 end 101 end
102 102
103 group :test do 103 group :test do
104 - gem 'capybara' 104 + # Capybara 2.1.0 no more support 1.8.7 ruby version
  105 + gem 'capybara', "~> 2.0.1"
105 gem 'launchy' 106 gem 'launchy'
106 gem 'database_cleaner' 107 gem 'database_cleaner'
107 gem 'email_spec' 108 gem 'email_spec'
@@ -72,12 +72,15 @@ GEM @@ -72,12 +72,15 @@ GEM
72 net-sftp (>= 2.0.0) 72 net-sftp (>= 2.0.0)
73 net-ssh (>= 2.0.14) 73 net-ssh (>= 2.0.14)
74 net-ssh-gateway (>= 1.1.0) 74 net-ssh-gateway (>= 1.1.0)
75 - capybara (2.1.0) 75 + capybara (2.0.3)
76 mime-types (>= 1.16) 76 mime-types (>= 1.16)
77 nokogiri (>= 1.3.3) 77 nokogiri (>= 1.3.3)
78 rack (>= 1.0.0) 78 rack (>= 1.0.0)
79 rack-test (>= 0.5.4) 79 rack-test (>= 0.5.4)
80 - xpath (~> 2.0) 80 + selenium-webdriver (~> 2.0)
  81 + xpath (~> 1.0.0)
  82 + childprocess (0.3.9)
  83 + ffi (~> 1.0, >= 1.0.11)
81 coderay (1.0.9) 84 coderay (1.0.9)
82 colorize (0.5.8) 85 colorize (0.5.8)
83 columnize (0.3.6) 86 columnize (0.3.6)
@@ -118,6 +121,7 @@ GEM @@ -118,6 +121,7 @@ GEM
118 multipart-post (~> 1.1) 121 multipart-post (~> 1.1)
119 faraday_middleware (0.8.8) 122 faraday_middleware (0.8.8)
120 faraday (>= 0.7.4, < 0.9) 123 faraday (>= 0.7.4, < 0.9)
  124 + ffi (1.8.1)
121 foreman (0.63.0) 125 foreman (0.63.0)
122 dotenv (>= 0.7) 126 dotenv (>= 0.7)
123 thor (>= 0.13.6) 127 thor (>= 0.13.6)
@@ -294,9 +298,15 @@ GEM @@ -294,9 +298,15 @@ GEM
294 linecache (>= 0.3) 298 linecache (>= 0.3)
295 ruby-fogbugz (0.1.1) 299 ruby-fogbugz (0.1.1)
296 crack 300 crack
  301 + rubyzip (0.9.9)
297 rushover (0.3.0) 302 rushover (0.3.0)
298 json 303 json
299 rest-client 304 rest-client
  305 + selenium-webdriver (2.33.0)
  306 + childprocess (>= 0.2.5)
  307 + multi_json (~> 1.0)
  308 + rubyzip
  309 + websocket (~> 1.0.4)
300 simple_oauth (0.2.0) 310 simple_oauth (0.2.0)
301 simplecov (0.7.1) 311 simplecov (0.7.1)
302 multi_json (~> 1.0) 312 multi_json (~> 1.0)
@@ -339,8 +349,9 @@ GEM @@ -339,8 +349,9 @@ GEM
339 webmock (1.11.0) 349 webmock (1.11.0)
340 addressable (>= 2.2.7) 350 addressable (>= 2.2.7)
341 crack (>= 0.3.2) 351 crack (>= 0.3.2)
  352 + websocket (1.0.7)
342 xmpp4r (0.5) 353 xmpp4r (0.5)
343 - xpath (2.0.0) 354 + xpath (1.0.0)
344 nokogiri (~> 1.3) 355 nokogiri (~> 1.3)
345 yajl-ruby (1.1.0) 356 yajl-ruby (1.1.0)
346 357
@@ -358,7 +369,7 @@ DEPENDENCIES @@ -358,7 +369,7 @@ DEPENDENCIES
358 bson_ext 369 bson_ext
359 campy (= 0.1.3) 370 campy (= 0.1.3)
360 capistrano 371 capistrano
361 - capybara 372 + capybara (~> 2.0.1)
362 coveralls 373 coveralls
363 database_cleaner 374 database_cleaner
364 debugger 375 debugger