Permalink
Browse files

Merge branch 'master' into issue-126

  • Loading branch information...
2 parents f70c9f7 + a4607d5 commit 56d679b642d1401e50d96e8588b562c23c09648c @preethiramdev preethiramdev committed Mar 15, 2012
Showing with 10 additions and 10 deletions.
  1. +2 −2 Changelog.md
  2. +2 −1 Gemfile
  3. +1 −1 README.md
  4. +1 −1 lib/rspec/core/version.rb
  5. +4 −5 rspec-core.gemspec
View
4 Changelog.md
@@ -1,5 +1,5 @@
-### dev
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.8.0...master)
+### 2.9.0.rc2 / 2012-02-12
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.8.0...v2.9.0.rc2)
Enhancements
View
3 Gemfile
@@ -2,7 +2,6 @@ source "http://rubygems.org"
gemspec
-### rspec libs
%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
library_path = File.expand_path("../../#{lib}", __FILE__)
if File.exist?(library_path)
@@ -12,6 +11,8 @@ gemspec
end
end
+gem 'rake', '~> 0.9.2'
+
platforms :jruby do
gem "jruby-openssl"
end
View
2 README.md
@@ -32,7 +32,7 @@ describe Order do
end
```
-The `describe` method creates an [ExampleGroup](../RSpec/Core/ExampleGroup). Within the
+The `describe` method creates an [ExampleGroup](http://rubydoc.info/gems/rspec-core/RSpec/Core/ExampleGroup). Within the
block passed to `describe` you can declare examples using the `it` method.
Under the hood, an example group is a class in which the block passed to
View
2 lib/rspec/core/version.rb
@@ -1,7 +1,7 @@
module RSpec
module Core
module Version
- STRING = '2.8.0'
+ STRING = '2.9.0.rc2'
end
end
end
View
9 rspec-core.gemspec
@@ -23,15 +23,14 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]
s.require_path = "lib"
- s.add_development_dependency "rake", "~> 0.9.2"
- s.add_development_dependency "cucumber", "~> 1.1.0"
+ s.add_development_dependency "cucumber", "~> 1.1.9"
s.add_development_dependency "aruba", "~> 0.4.11"
s.add_development_dependency "ZenTest", "4.6.2"
- s.add_development_dependency "nokogiri", "1.5.0"
+ s.add_development_dependency "nokogiri", "1.5.2"
s.add_development_dependency "fakefs", "0.4.0"
s.add_development_dependency "syntax", "1.0.0"
- s.add_development_dependency "mocha", "~> 0.10.0"
- s.add_development_dependency "rr", "~> 1.0.2"
+ s.add_development_dependency "mocha", "~> 0.10.5"
+ s.add_development_dependency "rr", "~> 1.0.4"
s.add_development_dependency "flexmock", "~> 0.9.0"
end

0 comments on commit 56d679b

Please sign in to comment.