spec/extensions/spec_helper.rb in sequel-3.36.1 vs spec/extensions/spec_helper.rb in sequel-3.37.0
- old
+ new
@@ -1,6 +1,15 @@
require 'rubygems'
+
+if defined?(RSpec)
+ begin
+ require 'rspec/expectations'
+ rescue LoadError
+ nil
+ end
+end
+
unless Object.const_defined?('Sequel')
$:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
require 'sequel/core'
end
unless Sequel.const_defined?('Model')
@@ -10,14 +19,15 @@
begin
# Attempt to load ActiveSupport inflector first, so Sequel inflector
# can override it.
require 'active_support/inflector'
- require 'active_support/string/inflections'
+ require 'active_support/core_ext/string/inflections'
rescue LoadError
+ nil
end
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers pg_auto_parameterize pg_statement_cache pg_hstore pg_hstore_ops pg_inet schema_caching null_dataset select_remove query_literals')
+Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers pg_auto_parameterize pg_statement_cache pg_array pg_array_ops pg_hstore pg_hstore_ops pg_range pg_range_ops pg_json pg_inet schema_caching null_dataset select_remove query_literals eval_inspect')
{:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
Sequel::Dataset.introspect_all_columns if ENV['SEQUEL_COLUMNS_INTROSPECTION']
def skip_warn(s)