summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@getchef.com>2014-09-13 15:03:00 -0400
committerSeth Chisamore <schisamo@getchef.com>2014-09-13 15:03:00 -0400
commit4d3967ac604efdfa379401213b61ed8c6c45e17e (patch)
tree14116e9a0d6b8e1ad93f193f87d0020b407ca4df
parent35dc3d5010dc6392f8fbb7f389534e47c0e0427a (diff)
downloadohai-schisamo/rspec-junit-formatter-fix.tar.gz
Pull `rspec_junit_formatter` from RubyGemsschisamo/rspec-junit-formatter-fix
Now that sj26/rspec_junit_formatter/#14 has been merged we can pull the gem in via RubyGems. The git-based Bundler resolution can cause strange issues n Windows. See dcd3625de6 for more.
-rw-r--r--Gemfile6
-rw-r--r--ohai.gemspec2
2 files changed, 1 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index aba36fa9..068273df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,12 +2,6 @@ source "https://rubygems.org"
gemspec
-# https://github.com/sj26/rspec_junit_formatter/pull/14
-# rspec_junit_formatter isn't compatible with RSpec3 yet, but is fixed in
-# master. Once it's released we should remove this.
-gem "rspec_junit_formatter", :git => 'https://github.com/sj26/rspec_junit_formatter.git',
- :ref => "147836c41fab23ff7b92806f34122c8e5f2ddcad"
-
group :development do
gem "chef", github: "opscode/chef", branch: "master"
diff --git a/ohai.gemspec b/ohai.gemspec
index d2a462ff..5679f59e 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec-expectations", "~> 3.0"
s.add_development_dependency "rspec-mocks", "~> 3.0"
s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
-# s.add_development_dependency "rspec_junit_formatter"
+ s.add_development_dependency "rspec_junit_formatter"
s.add_development_dependency "chef"
s.bindir = "bin"
s.executables = %w(ohai)