Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Encode JSON #75

Merged
merged 3 commits into from

2 participants

@sferik
Collaborator

This patch ensures the JSON written by #store_json is actually encoded.

Sorry for the bug. Please yank 0.5.1 and push 0.5.2 at your nearest convenience.

@colszowka colszowka merged commit 357fe1b into colszowka:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
1  features/support/env.rb
@@ -3,7 +3,6 @@
exit 0
end
-require 'rubygems'
require 'bundler'
Bundler.setup
require 'aruba/cucumber'
View
4 lib/simplecov.rb
@@ -1,5 +1,3 @@
-require 'rubygems'
-
#
# Code coverage for ruby 1.9. Please check out README for a full introduction.
#
@@ -119,7 +117,5 @@ def usable?
require 'simplecov/command_guesser'
require 'simplecov/version'
-autoload :JSON, 'json'
-
# Load default config
require 'simplecov/defaults'
View
2  lib/simplecov/result_merger.rb
@@ -71,7 +71,7 @@ def store_result(result)
if defined? ::JSON
f.puts JSON.pretty_generate(new_set)
else
- f.puts new_set
+ f.puts MultiJson.encode(new_set)
end
end
true
View
1  test/faked_project/features/support/env.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
require 'bundler/setup'
# We're injecting simplecov_config via aruba in cucumber here
View
1  test/faked_project/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
require 'bundler/setup'
# We're injecting simplecov_config via aruba in cucumber here
View
1  test/faked_project/test/test_helper.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
require 'bundler/setup'
# We're injecting simplecov_config via aruba in cucumber here
View
2  test/helper.rb
@@ -1,7 +1,5 @@
-require 'rubygems'
require 'bundler/setup'
require 'simplecov'
-
require 'test/unit'
require 'shoulda'
Something went wrong with that request. Please try again.