diff options
| author | fotanus@gmail.com <Felipe Tanus> | 2015-05-15 00:06:34 -0300 |
|---|---|---|
| committer | fotanus@gmail.com <Felipe Tanus> | 2015-05-15 00:06:34 -0300 |
| commit | ad69165cac0d8b0996bc2ec523751437220a4784 (patch) | |
| tree | d80abe8ee7658a25bf59436534ef2be1804eab19 | |
| parent | 7a69147a9c566d840242f1d36bef809925ee5154 (diff) | |
| parent | 7eea38e9886c57e74a39bfeccc88c75a45e9a191 (diff) | |
| download | bundler-ad69165cac0d8b0996bc2ec523751437220a4784.tar.gz | |
Merge branch 'master' into track_ci
| -rw-r--r-- | spec/commands/viz_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/rubygems_ext.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/commands/viz_spec.rb b/spec/commands/viz_spec.rb index 8039b0554c..76a23ed003 100644 --- a/spec/commands/viz_spec.rb +++ b/spec/commands/viz_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe "bundle viz", :if => Bundler.which("dot") do +describe "bundle viz", :if => (Bundler.which("dot") && RUBY_VERSION > "1.8.7") do let(:graphviz_lib) do graphviz_glob = base_system_gems.join("gems/ruby-graphviz*/lib") Dir[graphviz_glob].first diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 3426deff4d..e90b43fc16 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -21,7 +21,7 @@ module Spec `gem install builder --version 2.1.2 --no-rdoc --no-ri` `gem install rack --no-rdoc --no-ri` # ruby-graphviz is used by the viz tests - `gem install ruby-graphviz --no-rdoc --no-ri` + `gem install ruby-graphviz --no-rdoc --no-ri` if RUBY_VERSION > "1.8.7" end ENV['HOME'] = Path.home.to_s |