summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerence Lee <hone02@gmail.com>2013-11-09 21:15:43 -0500
committerTerence Lee <hone02@gmail.com>2013-11-09 21:15:43 -0500
commit1d8debe29d2352c57d80afafd4fec066b1a6b8ef (patch)
tree2172e3c7979f63db6a0677dc0a49248755f6889a
parentfa03c5b2b1fb3a2d2c5c9c46d63a75a04f882287 (diff)
downloadbundler-1d8debe29d2352c57d80afafd4fec066b1a6b8ef.tar.gz
Revert "Update to rspec 2.99"
This reverts commit a4c990c9bd4954b5f6d1a71acf1bc712119cb52d.
-rw-r--r--bundler.gemspec2
-rw-r--r--lib/bundler/templates/newgem/spec/newgem_spec.rb.tt4
-rw-r--r--spec/commands/newgem_spec.rb4
-rw-r--r--spec/install/gemfile/git_spec.rb4
-rw-r--r--spec/install/gems/simple_case_spec.rb2
-rw-r--r--spec/other/ext_spec.rb2
-rw-r--r--spec/spec_helper.rb2
7 files changed, 10 insertions, 10 deletions
diff --git a/bundler.gemspec b/bundler.gemspec
index 37c320e77e..6344e2ddab 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.required_rubygems_version = '>= 1.3.6'
spec.add_development_dependency 'ronn', '~> 0.7.3'
- spec.add_development_dependency 'rspec', '~> 2.99.0.beta1'
+ spec.add_development_dependency 'rspec', '~> 2.11'
spec.files = `git ls-files`.split($/)
spec.files += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
diff --git a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
index f8ef6e8c5f..ad324daaac 100644
--- a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
+++ b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
@@ -2,10 +2,10 @@ require 'spec_helper'
describe <%= config[:constant_name] %> do
it 'should have a version number' do
- expect(<%= config[:constant_name] %>::VERSION).not_to be nil
+ <%= config[:constant_name] %>::VERSION.should_not be_nil
end
it 'should do something useful' do
- expect(false).to be true
+ false.should be_true
end
end
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index 0cb3bafc70..7694e94740 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -154,7 +154,7 @@ describe "bundle gem" do
end
it "creates a default test which fails" do
- expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to match(/expect(false).to be true/)
+ expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to match(/false.should be_true/)
end
end
@@ -330,7 +330,7 @@ describe "bundle gem" do
end
it "creates a default test which fails" do
- expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to match(/expect(false).to be true/)
+ expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to match(/false.should be_true/)
end
it "creates a default rake task to run the specs" do
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index 2beddabcf2..ef36fb5b57 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -27,7 +27,7 @@ describe "bundle install with git sources" do
end
it "caches the git repo" do
- expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"].size).to eq(1)
+ expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have(1).item
end
it "caches the evaluated gemspec" do
@@ -911,4 +911,4 @@ describe "bundle install with git sources" do
expect(out).to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
end
end
-end
+end \ No newline at end of file
diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
index 250681f48b..322dbdf4f8 100644
--- a/spec/install/gems/simple_case_spec.rb
+++ b/spec/install/gems/simple_case_spec.rb
@@ -298,7 +298,7 @@ describe "bundle install with gem sources" do
install_gemfile <<-G
G
- expect(File.exists?(bundled_app("Gemfile.lock"))).to be true
+ expect(File.exists?(bundled_app("Gemfile.lock"))).to be_true
end
it "gracefully handles error when rubygems server is unavailable" do
diff --git a/spec/other/ext_spec.rb b/spec/other/ext_spec.rb
index 14c432be40..8ef5927c11 100644
--- a/spec/other/ext_spec.rb
+++ b/spec/other/ext_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe "Gem::Specification#match_platform" do
it "does not match platforms other than the gem platform" do
darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
- expect(darwin.match_platform(pl('java'))).to be false
+ expect(darwin.match_platform(pl('java'))).to be_false
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ec678f2d4c..6c36da4eda 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -88,7 +88,7 @@ RSpec.configure do |config|
in_app_root
end
- config.after :each do |example|
+ config.after :each do
puts @out if example.exception
Dir.chdir(original_wd)