aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorBaptiste Fontaine2016-01-27 21:53:06 +0100
committerBaptiste Fontaine2016-02-06 14:20:57 +0100
commitabf81f98454555f7d2254b27b67abe73e833e65e (patch)
treee85126c84779b243eb549d769c97b6b4f27ef88f /Library
parentd45467172d385f56a660e999f1df97e7fb21d98b (diff)
downloadbrew-abf81f98454555f7d2254b27b67abe73e833e65e.tar.bz2
tests: use our patched simplecov, bump coveralls
We must bump coveralls otherwise we get a conflicting dependency: we use a patched simplecov v0.11.1 but coveralls 0.8.9 needs simplecov 0.10.x.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/test/Gemfile15
-rw-r--r--Library/Homebrew/test/Gemfile.lock28
2 files changed, 31 insertions, 12 deletions
diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile
index fb546a56a..fb783b9b2 100644
--- a/Library/Homebrew/test/Gemfile
+++ b/Library/Homebrew/test/Gemfile
@@ -3,5 +3,16 @@ source "https://rubygems.org"
gem "mocha", "~> 1.1"
gem "minitest", "~> 5.3"
gem "rake", "~> 10.3"
-gem "simplecov", "~> 0.10.0", :require => false
-gem "coveralls", "0.8.9", :require => false
+# This is a patched version of the v0.11.2. Switch back to the stable version
+# when #436 has been merged upstream.
+# https://github.com/colszowka/simplecov/pull/436
+# See also https://github.com/Homebrew/homebrew/pull/48250#issuecomment-173171990
+gem "simplecov", "0.11.2",
+ :git => "https://github.com/Homebrew/simplecov.git",
+ :branch => "tracked-files-root-fix",
+ :require => false
+gem "coveralls", "0.8.10", :require => false
+# We need to pin these versions because those are the last supporting Ruby 1.8.
+# Remove these lines when we've stopped supporting it.
+gem "mime-types", "~> 1.16"
+gem "rest-client", "1.6.9"
diff --git a/Library/Homebrew/test/Gemfile.lock b/Library/Homebrew/test/Gemfile.lock
index d897f0c9b..71ac06f70 100644
--- a/Library/Homebrew/test/Gemfile.lock
+++ b/Library/Homebrew/test/Gemfile.lock
@@ -1,10 +1,20 @@
+GIT
+ remote: https://github.com/Homebrew/simplecov.git
+ revision: 4c7642496e902ba9028a74500971e40b3e3aaa29
+ branch: tracked-files-root-fix
+ specs:
+ simplecov (0.11.2)
+ docile (~> 1.1.0)
+ json (~> 1.8)
+ simplecov-html (~> 0.10.0)
+
GEM
remote: https://rubygems.org/
specs:
- coveralls (0.8.9)
+ coveralls (0.8.10)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
- simplecov (~> 0.10.0)
+ simplecov (~> 0.11.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
@@ -12,16 +22,12 @@ GEM
json (1.8.3)
metaclass (0.0.4)
mime-types (1.25.1)
- minitest (5.8.3)
+ minitest (5.8.4)
mocha (1.1.0)
metaclass (~> 0.0.1)
- rake (10.4.2)
+ rake (10.5.0)
rest-client (1.6.9)
mime-types (~> 1.16)
- simplecov (0.10.0)
- docile (~> 1.1.0)
- json (~> 1.8)
- simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
@@ -32,11 +38,13 @@ PLATFORMS
ruby
DEPENDENCIES
- coveralls (= 0.8.9)
+ coveralls (= 0.8.10)
+ mime-types (~> 1.16)
minitest (~> 5.3)
mocha (~> 1.1)
rake (~> 10.3)
- simplecov (~> 0.10.0)
+ rest-client (= 1.6.9)
+ simplecov (= 0.11.2)!
BUNDLED WITH
1.11.2