Merge pull request #138 from d/fix_rspec

Fix RSpec deprecation warnings. Makes Travis happy

spec/json_gem_compatibility/compatibility_spec.rb

@@ -192,15 +192,15 @@ class Dummy; end
       it "should be able to parse #{File.basename(name)} as an IO" do
           lambda {
             JSON.parse(StringIO.new(source))
-          }.should_not raise_error(JSON::ParserError)
+          }.should_not raise_error
       end
     end
 
     JSON_PASSED.each do |name, source|
       it "should be able to parse #{File.basename(name)} as a string" do
           lambda {
             JSON.parse(source)
-          }.should_not raise_error(JSON::ParserError)
+          }.should_not raise_error
       end
     end
   end

spec/parsing/active_support_spec.rb

@@ -38,15 +38,15 @@
     it "should be able to parse #{json} as an IO" do
       lambda {
         Yajl::Parser.parse(StringIO.new(json)).should == expected
-      }.should_not raise_error(Yajl::ParseError)
+      }.should_not raise_error
     end
   end
 
   TESTS.each do |json, expected|
     it "should be able to parse #{json} as a string" do
       lambda {
         Yajl::Parser.parse(json).should == expected
-      }.should_not raise_error(Yajl::ParseError)
+      }.should_not raise_error
     end
   end
 

spec/parsing/chunked_spec.rb

@@ -67,7 +67,7 @@
     @callback.should_receive(:call).exactly(430).times
     lambda {
       @parser.parse(json)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should parse twitter_stream.json and fire callback 430 times, with a block as the callback" do
@@ -81,7 +81,7 @@
         times += 1
       end
       times.should eql(430)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should raise a Yajl::ParseError error if multiple JSON strings were found when no on_parse_complete callback assigned" do
@@ -93,4 +93,4 @@
       @parser.parse(json)
     }.should raise_error(Yajl::ParseError)
   end
-end
+end

spec/parsing/fixtures_spec.rb

@@ -26,15 +26,15 @@
     it "should be able to parse #{File.basename(name)} as an IO" do
         lambda {
           Yajl::Parser.parse(StringIO.new(source))
-        }.should_not raise_error(Yajl::ParseError)
+        }.should_not raise_error
     end
   end
 
   PASSED.each do |name, source|
     it "should be able to parse #{File.basename(name)} as a string" do
         lambda {
           Yajl::Parser.parse(source)
-        }.should_not raise_error(Yajl::ParseError)
+        }.should_not raise_error
     end
   end
-end
+end

spec/parsing/one_off_spec.rb

@@ -20,7 +20,7 @@
     json = StringIO.new('{"key": /* this is a comment */ "value"}')
     lambda {
       Yajl::Parser.parse(json, :allow_comments => true)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should not parse invalid UTF8 with :check_utf8 set to true" do

spec/spec_helper.rb

@@ -1,6 +1,3 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
 require 'rspec'
 require 'yajl'
 require 'date'

yajl-ruby.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   # tests
   s.add_development_dependency 'rake-compiler', ">= 0.7.5"
-  s.add_development_dependency 'rspec', ">= 2.0.0"
+  s.add_development_dependency 'rspec', "~> 2.14"
   # benchmarks
   s.add_development_dependency 'activesupport', '~> 3.1.2'
   s.add_development_dependency 'json'