Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaces rcov for simplecov #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rcov generated
# simplecov generated
coverage

# rdoc generated
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ group :development do
gem "shoulda"
gem "bundler", "~> 1.0"
gem "jeweler", "~> 1.5"
gem "rcov"
gem 'simplecov'
gem 'fakeweb', '~> 1.3'
gem 'jnunemaker-matchy', '~> 0.4'
gem 'json_pure', '~> 1.4'
Expand Down
9 changes: 7 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
awesome_print (1.0.2)
docile (1.1.5)
fakeweb (1.3.0)
faraday (0.8.0)
multipart-post (~> 1.1)
Expand All @@ -21,8 +22,12 @@ GEM
multi_json (1.0.2)
multipart-post (1.1.5)
rake (0.9.2.2)
rcov (0.9.9)
shoulda (2.11.3)
simplecov (0.9.0)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)

PLATFORMS
ruby
Expand All @@ -39,5 +44,5 @@ DEPENDENCIES
json_pure (~> 1.4)
mocha
multi_json (>= 0.0.5, < 2.0.0)
rcov
shoulda
simplecov
7 changes: 0 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ Rake::TestTask.new(:test) do |test|
test.verbose = true
end

require 'rcov/rcovtask'
Rcov::RcovTask.new do |test|
test.libs << 'test'
test.pattern = 'test/**/test_*.rb'
test.verbose = true
end

task :default => :test

require 'rdoc/task'
Expand Down
7 changes: 3 additions & 4 deletions foursquare2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<simplecov>, [">= 0.9"])
s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_development_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
s.add_development_dependency(%q<json_pure>, ["~> 1.4"])
Expand All @@ -147,7 +147,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0.9"])
s.add_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
s.add_dependency(%q<json_pure>, ["~> 1.4"])
Expand All @@ -161,11 +161,10 @@ Gem::Specification.new do |s|
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0.9"])
s.add_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
s.add_dependency(%q<json_pure>, ["~> 1.4"])
s.add_dependency(%q<multi_json>, ["< 2.0.0", ">= 0.0.5"])
end
end

10 changes: 10 additions & 0 deletions test/helper.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'simplecov'
require 'rubygems'
require 'bundler'
begin
Expand All @@ -18,6 +19,15 @@

$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))

SimpleCov.start do
command_name 'Unit Tests'
filters.clear
add_filter do |src|
!(src.filename =~ /^#{SimpleCov.root}\/lib/)
end
end

require 'foursquare2'
require 'config'

Expand Down