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
Gemfile
... ... @@ -101,7 +101,8 @@ group :development do
101 101 end
102 102  
103 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 106 gem 'launchy'
106 107 gem 'database_cleaner'
107 108 gem 'email_spec'
... ...
Gemfile.lock
... ... @@ -72,12 +72,15 @@ GEM
72 72 net-sftp (>= 2.0.0)
73 73 net-ssh (>= 2.0.14)
74 74 net-ssh-gateway (>= 1.1.0)
75   - capybara (2.1.0)
  75 + capybara (2.0.3)
76 76 mime-types (>= 1.16)
77 77 nokogiri (>= 1.3.3)
78 78 rack (>= 1.0.0)
79 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 84 coderay (1.0.9)
82 85 colorize (0.5.8)
83 86 columnize (0.3.6)
... ... @@ -118,6 +121,7 @@ GEM
118 121 multipart-post (~> 1.1)
119 122 faraday_middleware (0.8.8)
120 123 faraday (>= 0.7.4, < 0.9)
  124 + ffi (1.8.1)
121 125 foreman (0.63.0)
122 126 dotenv (>= 0.7)
123 127 thor (>= 0.13.6)
... ... @@ -294,9 +298,15 @@ GEM
294 298 linecache (>= 0.3)
295 299 ruby-fogbugz (0.1.1)
296 300 crack
  301 + rubyzip (0.9.9)
297 302 rushover (0.3.0)
298 303 json
299 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 310 simple_oauth (0.2.0)
301 311 simplecov (0.7.1)
302 312 multi_json (~> 1.0)
... ... @@ -339,8 +349,9 @@ GEM
339 349 webmock (1.11.0)
340 350 addressable (>= 2.2.7)
341 351 crack (>= 0.3.2)
  352 + websocket (1.0.7)
342 353 xmpp4r (0.5)
343   - xpath (2.0.0)
  354 + xpath (1.0.0)
344 355 nokogiri (~> 1.3)
345 356 yajl-ruby (1.1.0)
346 357  
... ... @@ -358,7 +369,7 @@ DEPENDENCIES
358 369 bson_ext
359 370 campy (= 0.1.3)
360 371 capistrano
361   - capybara
  372 + capybara (~> 2.0.1)
362 373 coveralls
363 374 database_cleaner
364 375 debugger
... ...