diff options
author | Andre Arko <andre@arko.net> | 2013-06-25 18:22:58 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-06-25 18:22:58 -0700 |
commit | ac9092b47d85dba6780d4a4f49630b075e0b5270 (patch) | |
tree | 3b4db2c851428b771e435d03401197bdbbd65406 | |
parent | c73931d1f8facc96f6f38268d7245f2bc344e817 (diff) | |
parent | 616a805002f7804a3c58580254831290b0ff9c55 (diff) | |
download | bundler-ac9092b47d85dba6780d4a4f49630b075e0b5270.tar.gz |
Merge branch 'patches_update_specs' into 1-3-stable
closes #2513
-rw-r--r-- | spec/update/gems_spec.rb | 2 | ||||
-rw-r--r-- | spec/update/git_spec.rb | 4 | ||||
-rw-r--r-- | spec/update/source_spec.rb | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/spec/update/gems_spec.rb b/spec/update/gems_spec.rb index 3616fcdd89..1f03407b49 100644 --- a/spec/update/gems_spec.rb +++ b/spec/update/gems_spec.rb @@ -56,7 +56,7 @@ describe "bundle update" do end end - describe "with a unknown dependency" do + describe "with an unknown dependency" do it "should inform the user" do bundle "update halting-problem-solver", :expect_err=>true expect(out).to include "Could not find gem 'halting-problem-solver'" diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb index 53d6e5b275..cba5a1f72b 100644 --- a/spec/update/git_spec.rb +++ b/spec/update/git_spec.rb @@ -137,7 +137,7 @@ describe "bundle update" do end end - it "it unlocks the source when submodules is added to a git source" do + it "it unlocks the source when submodules are added to a git source" do install_gemfile <<-G git "#{lib_path('has_submodule-1.0')}" do gem "has_submodule" @@ -157,7 +157,7 @@ describe "bundle update" do expect(out).to eq('GIT') end - it "it unlocks the source when submodules is removed from git source" do + it "it unlocks the source when submodules are removed from git source" do pending "This would require actually removing the submodule from the clone" install_gemfile <<-G git "#{lib_path('has_submodule-1.0')}", :submodules => true do diff --git a/spec/update/source_spec.rb b/spec/update/source_spec.rb index 6134c7700c..22f3225428 100644 --- a/spec/update/source_spec.rb +++ b/spec/update/source_spec.rb @@ -47,5 +47,4 @@ describe "bundle update" do should_be_installed "rack 1.0" end end - end |