Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:rspec/rspec-core

  • Loading branch information...
commit 2a3abed19cbb69f8e29f2d05722eb015c6c2a617 2 parents d567ba3 + fcf781a
@dchelimsky dchelimsky authored
Showing with 12 additions and 1 deletion.
  1. +10 −1 Gemfile
  2. +1 −0  History.markdown
  3. +1 −0  Rakefile
View
11 Gemfile
@@ -1,7 +1,12 @@
source "http://rubygems.org"
%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
- gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+ library_path = File.expand_path("../../#{lib}", __FILE__)
+ if File.exist?(library_path)
+ gem lib, :path => library_path
+ else
+ gem lib
+ end
end
gem "rake"
@@ -25,3 +30,7 @@ platforms :ruby_18, :ruby_19 do
gem "rb-fsevent"
gem "ruby-prof"
end
+
+platforms :jruby do
+ gem "jruby-openssl"
+end
View
1  History.markdown
@@ -10,6 +10,7 @@
(Bosko Ivanisevic)
* Enhancements
+ * When developing locally rspec-core now works with the rspec-dev setup or your local gems
* Raise exception with helpful message when rspec-1 is loaded alongside
rspec-2 (Justin Ko)
* debugger statements _just work_ as long as ruby-debug is installed
View
1  Rakefile
@@ -22,6 +22,7 @@ desc "Run all examples"
RSpec::Core::RakeTask.new(:spec) do |t|
t.rspec_path = 'bin/rspec'
t.rspec_opts = %w[--color]
+ t.verbose = false
end
Cucumber::Rake::Task.new(:cucumber)
Please sign in to comment.
Something went wrong with that request. Please try again.