Skip to content

Commit

Permalink
rspec updated
Browse files Browse the repository at this point in the history
  • Loading branch information
hubertlepicki committed Mar 10, 2011
1 parent f386429 commit 036c05c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 52 deletions.
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ if RUBY_VERSION < '1.9'
end

gem "diff-lcs", "1.1.2", :require => nil
gem "rspec-rails", :git => "git://github.com/rspec/rspec-rails.git"
gem "rspec", :git => "git://github.com/rspec/rspec.git"
gem "rspec-core", :git => "git://github.com/rspec/rspec-core.git"
gem "rspec-expectations", :git => "git://github.com/rspec/rspec-expectations.git"
gem "rspec-mocks", :git => "git://github.com/rspec/rspec-mocks.git"
gem "rspec-rails"

gem "steak", :git => "git://github.com/cavalle/steak.git"
gem "capybara", "0.3.9", :require => nil
Expand Down
64 changes: 18 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,6 @@ GIT
steak (1.0.0.beta.2)
rspec

GIT
remote: git://github.com/rspec/rspec-core.git
revision: 792707bd88723c4e120ed0326979b23371074179
specs:
rspec-core (2.0.0.rc)

GIT
remote: git://github.com/rspec/rspec-expectations.git
revision: 6967fd6393a4c9a3aafc25045f64a54d17545834
specs:
rspec-expectations (2.0.0.rc)
diff-lcs (>= 1.1.2)

GIT
remote: git://github.com/rspec/rspec-mocks.git
revision: 361f31542f8ef4aa1a0cb8102893627022fcc88b
specs:
rspec-mocks (2.0.0.rc)
rspec-core (= 2.0.0.rc)
rspec-expectations (= 2.0.0.rc)

GIT
remote: git://github.com/rspec/rspec-rails.git
revision: b45d0936d77f3e532a08fc1b49f072be05873f94
specs:
rspec-rails (2.0.0.rc)
rspec (= 2.0.0.rc)

GIT
remote: git://github.com/rspec/rspec.git
revision: bf20df3f6652f15f014c7d6d546edd9456749196
specs:
rspec (2.0.0.rc)
rspec-core (= 2.0.0.rc)
rspec-expectations (= 2.0.0.rc)
rspec-mocks (= 2.0.0.rc)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -94,7 +57,7 @@ GEM
ffi (0.6.3)
rake (>= 0.8.7)
gem_plugin (0.2.3)
i18n (0.4.1)
i18n (0.4.2)
json_pure (1.4.6)
mail (2.2.7)
activesupport (>= 2.3.6)
Expand All @@ -111,7 +74,7 @@ GEM
rack (1.2.1)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.6)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.1)
actionmailer (= 3.0.1)
Expand All @@ -127,16 +90,29 @@ GEM
rake (>= 0.8.4)
thor (~> 0.14.0)
rake (0.8.7)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
rspec-core (2.5.1)
rspec-expectations (2.5.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
rspec-rails (2.5.0)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
rubyzip (0.9.4)
selenium-webdriver (0.0.28)
ffi (>= 0.6.1)
json_pure
rubyzip
thor (0.14.3)
thor (0.14.6)
timecop (0.3.5)
treetop (1.4.8)
polyglot (>= 0.3.1)
tzinfo (0.3.23)
tzinfo (0.3.24)

PLATFORMS
ruby
Expand All @@ -150,10 +126,6 @@ DEPENDENCIES
mongo (= 1.1)
mongrel (= 1.2.0.pre2)
rails (= 3.0.1)
rspec!
rspec-core!
rspec-expectations!
rspec-mocks!
rspec-rails!
rspec-rails
steak!
timecop (= 0.3.5)
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Load support files
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

Rspec.configure do |config|
RSpec.configure do |config|
# Remove this line if you don't want Rspec's should and should_not
# methods or matchers
require 'rspec/expectations'
Expand Down

0 comments on commit 036c05c

Please sign in to comment.