spec/spec_helper.rb in combustion-0.7.0 vs spec/spec_helper.rb in combustion-0.8.0

- old
+ new

@@ -1,11 +1,12 @@ -# coding: utf-8 -require 'bundler/setup' -require 'combustion' +# frozen_string_literal: true +require "bundler/setup" +require "combustion" + if Rails::VERSION::STRING.to_f < 4.1 - require 'active_record' - require 'active_record/connection_adapters/mysql2_adapter' + require "active_record" + require "active_record/connection_adapters/mysql2_adapter" class ActiveRecord::ConnectionAdapters::Mysql2Adapter NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY" end end