mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 04:37:06 -08:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
76 lines
1.9 KiB
Diff
76 lines
1.9 KiB
Diff
A small part of
|
|
|
|
commit d83002691a34a32b6d6d181817af7f8e68524638
|
|
Author: Erik Michaels-Ober <sferik@gmail.com>
|
|
Date: Sat May 14 09:26:31 2011 -0700
|
|
|
|
Cleanup
|
|
|
|
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
|
|
index 9be78f4..55238c9 100644
|
|
--- b/spec/multi_json_spec.rb
|
|
+++ a/spec/multi_json_spec.rb
|
|
@@ -1,9 +1,9 @@
|
|
-require 'helper'
|
|
+require 'spec_helper'
|
|
require 'stringio'
|
|
-
|
|
+
|
|
class MockDecoder
|
|
def self.decode(string, options = {})
|
|
- {'abc' => 'def'}
|
|
+ { 'abc' => 'def' }
|
|
end
|
|
|
|
def self.encode(string)
|
|
@@ -26,10 +26,16 @@
|
|
end
|
|
end
|
|
end
|
|
-
|
|
+
|
|
it 'defaults to the best available gem' do
|
|
- require 'yajl'
|
|
- MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
|
+ # the yajl-ruby gem does not work on jruby, so the best engine is the JsonGem engine
|
|
+ if jruby?
|
|
+ require 'json'
|
|
+ MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
|
|
+ else
|
|
+ require 'yajl'
|
|
+ MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
|
+ end
|
|
end
|
|
|
|
it 'is settable via a symbol' do
|
|
@@ -89,7 +95,7 @@
|
|
encoded_json = MultiJson.encode(:a => 1, :b => {:c => 2})
|
|
MultiJson.decode(encoded_json).should == { "a" => 1, "b" => { "c" => 2 } }
|
|
end
|
|
-
|
|
+
|
|
it "properly decodes valid JSON in StringIOs" do
|
|
json = StringIO.new('{"abc":"def"}')
|
|
MultiJson.decode(json).should == { 'abc' => 'def' }
|
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
|
|
deleted file mode 100644
|
|
index a9b66e6..0000000
|
|
--- /dev/null
|
|
+++ a/spec/spec_helper.rb
|
|
@@ -0,0 +1,15 @@
|
|
+begin
|
|
+ require 'bundler'
|
|
+rescue LoadError
|
|
+ puts "although not required, it's recommended that you use bundler during development"
|
|
+end
|
|
+
|
|
+require 'rspec'
|
|
+require 'rspec/autorun'
|
|
+
|
|
+$VERBOSE = true
|
|
+require 'multi_json'
|
|
+
|
|
+def jruby?
|
|
+ defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
|
|
+end
|