diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-07-09 13:46:23 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-07-09 13:46:23 -0700 |
| commit | 457842ff8567742d94cb079f439c38403a15d8b8 (patch) | |
| tree | 6171bb06b54874f297d24a3870a72052405dbde9 /spec | |
| parent | 79921599e7ba0f150f4cd093d626eea49831d8dc (diff) | |
| download | ffi-yajl-457842ff8567742d94cb079f439c38403a15d8b8.tar.gz | |
some more cop fixes
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 147e124..17dabcd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -28,18 +28,18 @@ $LOAD_PATH << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib")) begin require 'yajl' rescue LoadError - # yajl can't be installed on jruby + puts 'WARN: yajl cannot be loaded, expected if this is jruby' end require 'ffi_yajl' -RSpec.configure do |c| - c.filter_run_excluding :unix_only => true unless RUBY_PLATFORM !~ /mswin|mingw|windows/ - c.filter_run_excluding :ruby_gte_193 => true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/ +RSpec.configure do |conf| + conf.filter_run_excluding :unix_only => true unless RUBY_PLATFORM !~ /mswin|mingw|windows/ + conf.filter_run_excluding :ruby_gte_193 => true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/ - c.order = 'random' + conf.order = 'random' - c.expect_with :rspec do |c| - c.syntax = :expect + conf.expect_with :rspec do |rspec| + rspec.syntax = :expect end end |