spec/spec_helper.rb in ridgepole-0.6.6 vs spec/spec_helper.rb in ridgepole-0.7.0.alpha

- old
+ new

@@ -4,15 +4,10 @@ require 'spec_condition' require 'cli_helper' require 'processing_for_travis' -if condition [:mysql_awesome_enabled, :activerecord_5] - warn 'warning: Cannot use activerecord-mysql-awesome on ActiveRecord 5.0' - exit 0 -end - require 'ridgepole' require 'ridgepole/cli/config' require 'active_support/core_ext' require 'string_ext' # TODO: must be remove require 'open3' @@ -38,11 +33,11 @@ end end config.before(:each) do |example| if conds = example.metadata[:condition] - skip unless conds.any? {|c| condition(*c) } + skip unless Array(conds).any? {|c| condition(*c) } end case example.metadata[:file_path] when /mysql/ skip if condition(:postgresql) @@ -99,18 +94,10 @@ end def client(options = {}, config = {}) config = conn_spec(config) default_options = {debug: condition(:debug)} - - if condition(:mysql_awesome_enabled) - default_options[:enable_mysql_awesome] = true - default_options[:dump_without_table_options] = true - end - - if condition(:activerecord_5) - default_options[:dump_without_table_options] = true - end + default_options[:dump_without_table_options] = true options = default_options.merge(options) Ridgepole::Client.new(config, options) end