nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update spork, rspec, cucumber, and selenium webdriver

Browse source
This commit is contained in:
Maxwell Salzberg 2012-04-03 22:54:15 -07:00
parent 16354ae712
commit 7b3e2d7680
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Gemfile
View file

@ -101,7 +101,7 @@ gem 'typhoeus'
gem 'haml' gem 'haml'
gem 'mobile-fu' gem 'mobile-fu'
gem 'sass'
gem 'will_paginate' gem 'will_paginate'
gem 'client_side_validations' gem 'client_side_validations'
@ -139,7 +139,7 @@ gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git'
group :test do group :test do
gem 'capybara', '~> 1.1.2' gem 'capybara', '~> 1.1.2'
gem 'cucumber-rails', '1.2.1', :require => false gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.7.1' gem 'database_cleaner', '0.7.1'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git' gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
@ -150,15 +150,16 @@ group :test do
gem 'fuubar', '0.0.6' gem 'fuubar', '0.0.6'
gem 'mongrel', :require => false, :platforms => :ruby_18 gem 'mongrel', :require => false, :platforms => :ruby_18
gem 'rspec', '>= 2.0.0' gem 'rspec', '>= 2.0.0'
gem 'rspec-core', '~> 2.8.0' gem 'rspec-core', '~> 2.9.0'
gem 'rspec-instafail', '>= 0.1.7', :require => false gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'rspec-rails', '>= 2.0.0' gem "rspec-rails", "~> 2.9.0"
gem 'selenium-webdriver', '~> 2.16.0' gem 'selenium-webdriver', '~> 2.19.0'
gem 'webmock', :require => false gem 'webmock', :require => false
gem 'sqlite3' gem 'sqlite3'
gem 'mock_redis' gem 'mock_redis'
gem 'spork', '~> 1.0rc' gem 'spork', '~> 1.0rc2'
gem 'guard-rspec' gem 'guard-rspec'
gem 'guard-spork' gem 'guard-spork'
gem 'guard-cucumber' gem 'guard-cucumber'

37
Gemfile.lock
View file

@ -127,9 +127,9 @@ GEM
gherkin (~> 2.9.0) gherkin (~> 2.9.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-rails (1.2.1) cucumber-rails (1.3.0)
capybara (>= 1.1.2) capybara (>= 1.1.2)
cucumber (>= 1.1.3) cucumber (>= 1.1.8)
nokogiri (>= 1.5.0) nokogiri (>= 1.5.0)
daemons (1.1.8) daemons (1.1.8)
database_cleaner (0.7.1) database_cleaner (0.7.1)
@ -364,20 +364,20 @@ GEM
rpm_contrib (2.1.8) rpm_contrib (2.1.8)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
rspec (2.8.0) rspec (2.9.0)
rspec-core (~> 2.8.0) rspec-core (~> 2.9.0)
rspec-expectations (~> 2.8.0) rspec-expectations (~> 2.9.0)
rspec-mocks (~> 2.8.0) rspec-mocks (~> 2.9.0)
rspec-core (2.8.0) rspec-core (2.9.0)
rspec-expectations (2.8.0) rspec-expectations (2.9.1)
diff-lcs (~> 1.1.2) diff-lcs (~> 1.1.3)
rspec-instafail (0.1.9) rspec-instafail (0.1.9)
rspec-mocks (2.8.0) rspec-mocks (2.9.0)
rspec-rails (2.8.1) rspec-rails (2.9.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.8.0) rspec (~> 2.9.0)
ruby-debug (0.10.4) ruby-debug (0.10.4)
columnize (>= 0.1) columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0) ruby-debug-base (~> 0.10.4.0)
@ -404,7 +404,7 @@ GEM
sass (>= 3.1.4) sass (>= 3.1.4)
sprockets (~> 2.0.0) sprockets (~> 2.0.0)
tilt (~> 1.3.2) tilt (~> 1.3.2)
selenium-webdriver (2.16.0) selenium-webdriver (2.19.0)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0.9) ffi (~> 1.0.9)
multi_json (~> 1.0.4) multi_json (~> 1.0.4)
@ -481,7 +481,7 @@ DEPENDENCIES
capybara (~> 1.1.2) capybara (~> 1.1.2)
carrierwave (= 0.5.8) carrierwave (= 0.5.8)
client_side_validations client_side_validations
cucumber-rails (= 1.2.1) cucumber-rails (= 1.3.0)
database_cleaner (= 0.7.1) database_cleaner (= 0.7.1)
devise (= 1.5.3) devise (= 1.5.3)
diaspora-client! diaspora-client!
@ -541,17 +541,16 @@ DEPENDENCIES
roxml! roxml!
rpm_contrib (~> 2.1.7) rpm_contrib (~> 2.1.7)
rspec (>= 2.0.0) rspec (>= 2.0.0)
rspec-core (~> 2.8.0) rspec-core (~> 2.9.0)
rspec-instafail (>= 0.1.7) rspec-instafail (>= 0.1.7)
rspec-rails (>= 2.0.0) rspec-rails (~> 2.9.0)
ruby-debug ruby-debug
ruby-debug19 ruby-debug19
ruby-oembed (~> 0.8.7) ruby-oembed (~> 0.8.7)
sass
sass-rails (= 3.1.4) sass-rails (= 3.1.4)
selenium-webdriver (~> 2.16.0) selenium-webdriver (~> 2.19.0)
settingslogic! settingslogic!
spork (~> 1.0rc) spork (~> 1.0rc2)
sqlite3 sqlite3
thin (~> 1.3.1) thin (~> 1.3.1)
timecop timecop