Skip to content

Commit

Permalink
Merge pull request #2586 from zz9pzza/AO3-4684
Browse files Browse the repository at this point in the history
AO3-4684 Upgrade simplecov and coveralls and tins
  • Loading branch information
sarken committed Oct 21, 2016
2 parents 7812844 + 8ccb6da commit 88e52ba
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -125,8 +125,8 @@ group :test do
gem 'vcr', '~> 3.0', '>= 3.0.1'
gem 'webmock', '~> 1.24.2'
# Code coverage
gem 'simplecov', '~> 0.11.2',:require => false,:group => :test
gem 'coveralls', require: false
gem 'simplecov', '~> 0.12.0'
gem 'coveralls', '~> 0.8.12'
gem 'email_spec', '1.6.0'
end

Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Expand Up @@ -84,12 +84,12 @@ GEM
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1)
connection_pool (2.2.0)
coveralls (0.8.13)
json (~> 1.8)
simplecov (~> 0.11.0)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
tins (>= 1.6.0, < 2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
css_parser (1.3.7)
Expand Down Expand Up @@ -332,9 +332,9 @@ GEM
shoulda-context (1.1.4)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
simplecov (0.11.2)
simplecov (0.12.0)
docile (~> 1.1.0)
json (~> 1.8)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.4.6)
Expand All @@ -357,7 +357,7 @@ GEM
thor (0.19.1)
tilt (1.4.1)
timeliness (0.3.8)
tins (1.6.0)
tins (1.12.0)
tire (0.6.2)
activemodel (>= 3.0)
activesupport
Expand Down Expand Up @@ -427,7 +427,7 @@ DEPENDENCIES
capybara (~> 2.6.2)
cocaine
connection_pool
coveralls
coveralls (~> 0.8.12)
css_parser
cucumber (~> 2.3.2)
cucumber-rails (~> 1.4.3)
Expand Down Expand Up @@ -475,7 +475,7 @@ DEPENDENCIES
rvm-capistrano
sanitize
shoulda
simplecov (~> 0.11.2)
simplecov (~> 0.12.0)
test-unit (~> 3.0)
test_after_commit
timeliness
Expand Down

0 comments on commit 88e52ba

Please sign in to comment.