diff --git a/spec/database_cleaner/active_record/base_spec.rb b/spec/database_cleaner/active_record/base_spec.rb index ab27d03..fc37927 100644 --- a/spec/database_cleaner/active_record/base_spec.rb +++ b/spec/database_cleaner/active_record/base_spec.rb @@ -9,7 +9,7 @@ class FakeModel end end -describe DatabaseCleaner::ActiveRecord do +RSpec.describe DatabaseCleaner::ActiveRecord do it { is_expected.to respond_to(:available_strategies) } describe "config_file_location" do @@ -32,7 +32,7 @@ module DatabaseCleaner include DatabaseCleaner::ActiveRecord::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do let(:config_location) { '/path/to/config/database.yml' } before do diff --git a/spec/database_cleaner/active_record/transaction_spec.rb b/spec/database_cleaner/active_record/transaction_spec.rb index db7524d..c91c319 100644 --- a/spec/database_cleaner/active_record/transaction_spec.rb +++ b/spec/database_cleaner/active_record/transaction_spec.rb @@ -4,7 +4,7 @@ require 'active_record' module DatabaseCleaner module ActiveRecord - describe Transaction do + RSpec.describe Transaction do let (:connection) { double("connection") } let (:connection_2) { double("connection") } let (:connection_pool) { double("connection_pool")} diff --git a/spec/database_cleaner/active_record/truncation/mysql2_spec.rb b/spec/database_cleaner/active_record/truncation/mysql2_spec.rb index d7c26a0..43c539e 100644 --- a/spec/database_cleaner/active_record/truncation/mysql2_spec.rb +++ b/spec/database_cleaner/active_record/truncation/mysql2_spec.rb @@ -3,7 +3,7 @@ require 'support/active_record/mysql2_setup' require 'database_cleaner/active_record/truncation' require 'database_cleaner/active_record/truncation/shared_fast_truncation' -describe DatabaseCleaner::ActiveRecord::Truncation do +RSpec.describe DatabaseCleaner::ActiveRecord::Truncation do let(:helper) { MySQL2Helper.new } let(:connection) do diff --git a/spec/database_cleaner/active_record/truncation/mysql_spec.rb b/spec/database_cleaner/active_record/truncation/mysql_spec.rb index 468aca8..d3373b1 100644 --- a/spec/database_cleaner/active_record/truncation/mysql_spec.rb +++ b/spec/database_cleaner/active_record/truncation/mysql_spec.rb @@ -3,7 +3,7 @@ require 'support/active_record/mysql_setup' require 'database_cleaner/active_record/truncation' require 'database_cleaner/active_record/truncation/shared_fast_truncation' -describe DatabaseCleaner::ActiveRecord::Truncation do +RSpec.describe DatabaseCleaner::ActiveRecord::Truncation do let(:helper) { MySQLHelper.new } let(:connection) do diff --git a/spec/database_cleaner/active_record/truncation/postgresql_spec.rb b/spec/database_cleaner/active_record/truncation/postgresql_spec.rb index 8e7e085..3c3faca 100644 --- a/spec/database_cleaner/active_record/truncation/postgresql_spec.rb +++ b/spec/database_cleaner/active_record/truncation/postgresql_spec.rb @@ -3,7 +3,7 @@ require 'support/active_record/postgresql_setup' require 'database_cleaner/active_record/truncation' require 'database_cleaner/active_record/truncation/shared_fast_truncation' -describe DatabaseCleaner::ActiveRecord::Truncation do +RSpec.describe DatabaseCleaner::ActiveRecord::Truncation do let(:helper) { PostgreSQLHelper.new } let(:connection) do diff --git a/spec/database_cleaner/active_record/truncation/shared_fast_truncation.rb b/spec/database_cleaner/active_record/truncation/shared_fast_truncation.rb index dda580c..10d7571 100644 --- a/spec/database_cleaner/active_record/truncation/shared_fast_truncation.rb +++ b/spec/database_cleaner/active_record/truncation/shared_fast_truncation.rb @@ -1,4 +1,4 @@ -shared_examples_for "an adapter with pre-count truncation" do +RSpec.shared_examples_for "an adapter with pre-count truncation" do describe "#pre_count_truncate_tables" do context "with :reset_ids set true" do diff --git a/spec/database_cleaner/active_record/truncation/sqlite3_spec.rb b/spec/database_cleaner/active_record/truncation/sqlite3_spec.rb index f9f4f28..572d428 100644 --- a/spec/database_cleaner/active_record/truncation/sqlite3_spec.rb +++ b/spec/database_cleaner/active_record/truncation/sqlite3_spec.rb @@ -2,7 +2,7 @@ require 'active_record' require 'support/active_record/sqlite3_setup' require 'database_cleaner/active_record/truncation' -describe DatabaseCleaner::ActiveRecord::Truncation do +RSpec.describe DatabaseCleaner::ActiveRecord::Truncation do let(:helper) { SQLite3Helper.new } let(:connection) do diff --git a/spec/database_cleaner/active_record/truncation_spec.rb b/spec/database_cleaner/active_record/truncation_spec.rb index 65d83e0..15cfc29 100644 --- a/spec/database_cleaner/active_record/truncation_spec.rb +++ b/spec/database_cleaner/active_record/truncation_spec.rb @@ -10,7 +10,7 @@ module ActiveRecord module ConnectionAdapters #JdbcAdapter IBM_DBAdapter [ MysqlAdapter, Mysql2Adapter, SQLite3Adapter, PostgreSQLAdapter ].each do |adapter| - describe adapter, "#truncate_table" do + RSpec.describe adapter, "#truncate_table" do it "responds" do expect(adapter.instance_methods).to include(:truncate_table) end @@ -22,7 +22,7 @@ end module DatabaseCleaner module ActiveRecord - describe Truncation do + RSpec.describe Truncation do let(:connection) { double('connection') } before(:each) do diff --git a/spec/database_cleaner/base_spec.rb b/spec/database_cleaner/base_spec.rb index ba3f9c6..bbe1c76 100644 --- a/spec/database_cleaner/base_spec.rb +++ b/spec/database_cleaner/base_spec.rb @@ -6,7 +6,7 @@ require 'database_cleaner/couch_potato/truncation' require 'database_cleaner/neo4j/transaction' module DatabaseCleaner - describe Base do + RSpec.describe Base do let(:mock_strategy) { double("strategy").tap{|strategy| diff --git a/spec/database_cleaner/configuration_spec.rb b/spec/database_cleaner/configuration_spec.rb index 035e8d7..8f30f86 100644 --- a/spec/database_cleaner/configuration_spec.rb +++ b/spec/database_cleaner/configuration_spec.rb @@ -20,7 +20,7 @@ module DatabaseCleaner end end -describe DatabaseCleaner do +RSpec.describe DatabaseCleaner do before(:each) { DatabaseCleaner.reset } context "orm specification" do diff --git a/spec/database_cleaner/couch_potato/truncation_spec.rb b/spec/database_cleaner/couch_potato/truncation_spec.rb index c69be10..8f4360a 100644 --- a/spec/database_cleaner/couch_potato/truncation_spec.rb +++ b/spec/database_cleaner/couch_potato/truncation_spec.rb @@ -4,7 +4,7 @@ require 'couch_potato' module DatabaseCleaner module CouchPotato - describe Truncation do + RSpec.describe Truncation do let(:database) { double('database') } before(:each) do diff --git a/spec/database_cleaner/data_mapper/base_spec.rb b/spec/database_cleaner/data_mapper/base_spec.rb index 61b819d..ff5f822 100644 --- a/spec/database_cleaner/data_mapper/base_spec.rb +++ b/spec/database_cleaner/data_mapper/base_spec.rb @@ -2,7 +2,7 @@ require 'database_cleaner/data_mapper/base' require 'database_cleaner/shared_strategy' module DatabaseCleaner - describe DataMapper do + RSpec.describe DataMapper do it { is_expected.to respond_to(:available_strategies) } end @@ -11,7 +11,7 @@ module DatabaseCleaner include ::DatabaseCleaner::DataMapper::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do it_should_behave_like "a generic strategy" it { is_expected.to respond_to(:db) } it { is_expected.to respond_to(:db=) } diff --git a/spec/database_cleaner/data_mapper/transaction_spec.rb b/spec/database_cleaner/data_mapper/transaction_spec.rb index a7350e2..91f827c 100644 --- a/spec/database_cleaner/data_mapper/transaction_spec.rb +++ b/spec/database_cleaner/data_mapper/transaction_spec.rb @@ -5,7 +5,7 @@ require 'database_cleaner/shared_strategy' module DatabaseCleaner module DataMapper - describe Transaction do + RSpec.describe Transaction do it_should_behave_like "a generic strategy" it_should_behave_like "a generic transaction strategy" diff --git a/spec/database_cleaner/data_mapper/truncation/sqlite3_spec.rb b/spec/database_cleaner/data_mapper/truncation/sqlite3_spec.rb index a014569..f7f82cd 100644 --- a/spec/database_cleaner/data_mapper/truncation/sqlite3_spec.rb +++ b/spec/database_cleaner/data_mapper/truncation/sqlite3_spec.rb @@ -3,7 +3,7 @@ require 'dm-sqlite-adapter' require 'support/data_mapper/sqlite3_setup' require 'database_cleaner/data_mapper/truncation' -describe DatabaseCleaner::DataMapper::Truncation do +RSpec.describe DatabaseCleaner::DataMapper::Truncation do let(:helper) { DataMapperSQLite3Helper.new } let(:connection) do diff --git a/spec/database_cleaner/data_mapper/truncation_spec.rb b/spec/database_cleaner/data_mapper/truncation_spec.rb index 7e3c11d..9fd3916 100644 --- a/spec/database_cleaner/data_mapper/truncation_spec.rb +++ b/spec/database_cleaner/data_mapper/truncation_spec.rb @@ -3,7 +3,7 @@ require 'database_cleaner/shared_strategy' module DatabaseCleaner module DataMapper - describe Truncation do + RSpec.describe Truncation do it_should_behave_like "a generic strategy" it_should_behave_like "a generic truncation strategy" end diff --git a/spec/database_cleaner/generic/base_spec.rb b/spec/database_cleaner/generic/base_spec.rb index 61aa98b..8eef96a 100644 --- a/spec/database_cleaner/generic/base_spec.rb +++ b/spec/database_cleaner/generic/base_spec.rb @@ -10,7 +10,7 @@ module ::DatabaseCleaner def start; end end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do context "class methods" do subject { ExampleStrategy } diff --git a/spec/database_cleaner/generic/truncation_spec.rb b/spec/database_cleaner/generic/truncation_spec.rb index d155a9d..39cf267 100644 --- a/spec/database_cleaner/generic/truncation_spec.rb +++ b/spec/database_cleaner/generic/truncation_spec.rb @@ -28,7 +28,7 @@ module ::DatabaseCleaner end end - describe TruncationExample do + RSpec.describe TruncationExample do subject(:truncation_example) { TruncationExample.new } it "will start" do diff --git a/spec/database_cleaner/mongo/truncation_spec.rb b/spec/database_cleaner/mongo/truncation_spec.rb index 922648d..9cf1dff 100644 --- a/spec/database_cleaner/mongo/truncation_spec.rb +++ b/spec/database_cleaner/mongo/truncation_spec.rb @@ -2,7 +2,7 @@ require 'mongo' require 'database_cleaner/mongo/truncation' require File.dirname(__FILE__) + '/mongo_examples' -describe DatabaseCleaner::Mongo::Truncation do +RSpec.describe DatabaseCleaner::Mongo::Truncation do around do |example| connection = Mongo::Connection.new('127.0.0.1') db_name = 'database_cleaner_specs' diff --git a/spec/database_cleaner/mongo_mapper/base_spec.rb b/spec/database_cleaner/mongo_mapper/base_spec.rb index 03a93ad..9b1d95d 100644 --- a/spec/database_cleaner/mongo_mapper/base_spec.rb +++ b/spec/database_cleaner/mongo_mapper/base_spec.rb @@ -2,7 +2,7 @@ require 'database_cleaner/mongo_mapper/base' require 'database_cleaner/shared_strategy' module DatabaseCleaner - describe MongoMapper do + RSpec.describe MongoMapper do it { is_expected.to respond_to(:available_strategies) } end @@ -11,7 +11,7 @@ module DatabaseCleaner include ::DatabaseCleaner::MongoMapper::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do it_should_behave_like "a generic strategy" diff --git a/spec/database_cleaner/mongo_mapper/truncation_spec.rb b/spec/database_cleaner/mongo_mapper/truncation_spec.rb index 211d3b6..ce0a3f6 100644 --- a/spec/database_cleaner/mongo_mapper/truncation_spec.rb +++ b/spec/database_cleaner/mongo_mapper/truncation_spec.rb @@ -2,7 +2,7 @@ require 'mongo_mapper' require 'database_cleaner/mongo_mapper/truncation' require File.dirname(__FILE__) + '/mongo_examples' -describe DatabaseCleaner::MongoMapper::Truncation do +RSpec.describe DatabaseCleaner::MongoMapper::Truncation do around do |example| MongoMapper.connection = Mongo::Connection.new('127.0.0.1') db_name = 'database_cleaner_specs' diff --git a/spec/database_cleaner/moped/truncation_spec.rb b/spec/database_cleaner/moped/truncation_spec.rb index 08b1c58..758dcff 100644 --- a/spec/database_cleaner/moped/truncation_spec.rb +++ b/spec/database_cleaner/moped/truncation_spec.rb @@ -2,7 +2,7 @@ require 'moped' require 'database_cleaner/moped/truncation' require File.dirname(__FILE__) + '/moped_examples' -describe DatabaseCleaner::Moped::Truncation do +RSpec.describe DatabaseCleaner::Moped::Truncation do around do |example| db_name = 'database_cleaner_specs' session = ::Moped::Session.new(['127.0.0.1:27017'], database: db_name) diff --git a/spec/database_cleaner/neo4j/base_spec.rb b/spec/database_cleaner/neo4j/base_spec.rb index 4d0c97c..503e0fe 100644 --- a/spec/database_cleaner/neo4j/base_spec.rb +++ b/spec/database_cleaner/neo4j/base_spec.rb @@ -2,7 +2,7 @@ require 'database_cleaner/neo4j/base' require 'database_cleaner/shared_strategy' module DatabaseCleaner - describe Neo4j do + RSpec.describe Neo4j do it { is_expected.to respond_to(:available_strategies) } end @@ -11,7 +11,7 @@ module DatabaseCleaner include ::DatabaseCleaner::Neo4j::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do it_should_behave_like "a generic strategy" it { is_expected.to respond_to(:db) } diff --git a/spec/database_cleaner/neo4j/transaction_spec.rb b/spec/database_cleaner/neo4j/transaction_spec.rb index d0b213b..7c4be0a 100644 --- a/spec/database_cleaner/neo4j/transaction_spec.rb +++ b/spec/database_cleaner/neo4j/transaction_spec.rb @@ -5,7 +5,7 @@ require 'database_cleaner/shared_strategy' module DatabaseCleaner module Neo4j - describe Transaction do + RSpec.describe Transaction do before(:all) do DatabaseCleaner[:neo4j, :connection => {:type => :server_db, :path => 'http://localhost:7474'}] end diff --git a/spec/database_cleaner/null_strategy_spec.rb b/spec/database_cleaner/null_strategy_spec.rb index 0b982f0..0345ffd 100644 --- a/spec/database_cleaner/null_strategy_spec.rb +++ b/spec/database_cleaner/null_strategy_spec.rb @@ -1,7 +1,7 @@ require "database_cleaner/null_strategy" module DatabaseCleaner - describe NullStrategy do + RSpec.describe NullStrategy do it 'responds to .start' do expect { NullStrategy.start }.not_to raise_error end diff --git a/spec/database_cleaner/ohm/truncation_spec.rb b/spec/database_cleaner/ohm/truncation_spec.rb index 9712ea0..bee581e 100644 --- a/spec/database_cleaner/ohm/truncation_spec.rb +++ b/spec/database_cleaner/ohm/truncation_spec.rb @@ -11,7 +11,7 @@ module OhmTests end end -describe DatabaseCleaner::Ohm::Truncation do +RSpec.describe DatabaseCleaner::Ohm::Truncation do around do |example| config = YAML::load(File.open("#{File.dirname(__FILE__)}/../../../examples/config/redis.yml")) Ohm.connect url: config['test']['url'] diff --git a/spec/database_cleaner/redis/base_spec.rb b/spec/database_cleaner/redis/base_spec.rb index 81f90c2..e30e576 100644 --- a/spec/database_cleaner/redis/base_spec.rb +++ b/spec/database_cleaner/redis/base_spec.rb @@ -3,7 +3,7 @@ require 'database_cleaner/redis/base' require 'database_cleaner/shared_strategy' module DatabaseCleaner - describe Redis do + RSpec.describe Redis do it { is_expected.to respond_to(:available_strategies) } end @@ -12,7 +12,7 @@ module DatabaseCleaner include ::DatabaseCleaner::Redis::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do it_should_behave_like "a generic strategy" it { is_expected.to respond_to(:db) } diff --git a/spec/database_cleaner/redis/truncation_spec.rb b/spec/database_cleaner/redis/truncation_spec.rb index 1b2bcfa..739648d 100644 --- a/spec/database_cleaner/redis/truncation_spec.rb +++ b/spec/database_cleaner/redis/truncation_spec.rb @@ -1,7 +1,7 @@ require 'redis' require 'database_cleaner/redis/truncation' -describe DatabaseCleaner::Redis::Truncation do +RSpec.describe DatabaseCleaner::Redis::Truncation do around do |example| config = YAML::load(File.open("#{File.dirname(__FILE__)}/../../../examples/config/redis.yml")) @redis = ::Redis.new :url => config['test']['url'] diff --git a/spec/database_cleaner/safeguard_spec.rb b/spec/database_cleaner/safeguard_spec.rb index 911b377..689bc59 100644 --- a/spec/database_cleaner/safeguard_spec.rb +++ b/spec/database_cleaner/safeguard_spec.rb @@ -2,7 +2,7 @@ require 'active_record' require 'database_cleaner/active_record/transaction' module DatabaseCleaner - describe Safeguard do + RSpec.describe Safeguard do let(:strategy) { DatabaseCleaner::ActiveRecord::Transaction } let(:cleaner) { Base.new(:autodetect) } diff --git a/spec/database_cleaner/sequel/base_spec.rb b/spec/database_cleaner/sequel/base_spec.rb index 16fa9e9..a2e9244 100644 --- a/spec/database_cleaner/sequel/base_spec.rb +++ b/spec/database_cleaner/sequel/base_spec.rb @@ -3,7 +3,7 @@ require 'database_cleaner/shared_strategy' require 'sequel' module DatabaseCleaner - describe Sequel do + RSpec.describe Sequel do it { is_expected.to respond_to(:available_strategies) } end @@ -12,7 +12,7 @@ module DatabaseCleaner include ::DatabaseCleaner::Sequel::Base end - describe ExampleStrategy do + RSpec.describe ExampleStrategy do it_should_behave_like "a generic strategy" it { is_expected.to respond_to(:db) } it { is_expected.to respond_to(:db=) } diff --git a/spec/database_cleaner/sequel/deletion_spec.rb b/spec/database_cleaner/sequel/deletion_spec.rb index e5255e6..bbca31e 100644 --- a/spec/database_cleaner/sequel/deletion_spec.rb +++ b/spec/database_cleaner/sequel/deletion_spec.rb @@ -7,11 +7,11 @@ require 'support/active_record/database_setup' module DatabaseCleaner module Sequel - describe Deletion do + RSpec.describe Deletion do it_should_behave_like "a generic strategy" end - shared_examples 'a Sequel deletion strategy' do + RSpec.shared_examples 'a Sequel deletion strategy' do let(:deletion) do d = Deletion.new d.db = db @@ -49,7 +49,7 @@ module DatabaseCleaner ] supported_configurations.each do |config| - describe "Sequel deletion (using a #{config[:url]} connection)" do + RSpec.describe "Sequel deletion (using a #{config[:url]} connection)" do let(:db) { ::Sequel.connect(config[:url], config[:connection_options]) } around do |example| diff --git a/spec/database_cleaner/sequel/transaction_spec.rb b/spec/database_cleaner/sequel/transaction_spec.rb index 85636ac..f24856c 100644 --- a/spec/database_cleaner/sequel/transaction_spec.rb +++ b/spec/database_cleaner/sequel/transaction_spec.rb @@ -4,7 +4,7 @@ require 'sequel' module DatabaseCleaner module Sequel - describe Transaction do + RSpec.describe Transaction do it_should_behave_like "a generic strategy" it_should_behave_like "a generic transaction strategy" diff --git a/spec/database_cleaner/sequel/truncation_spec.rb b/spec/database_cleaner/sequel/truncation_spec.rb index 4ebdb3f..e5f8a54 100644 --- a/spec/database_cleaner/sequel/truncation_spec.rb +++ b/spec/database_cleaner/sequel/truncation_spec.rb @@ -7,12 +7,12 @@ require 'support/active_record/database_setup' module DatabaseCleaner module Sequel - describe Truncation do + RSpec.describe Truncation do it_should_behave_like "a generic strategy" it_should_behave_like "a generic truncation strategy" end - shared_examples 'a Sequel truncation strategy' do + RSpec.shared_examples 'a Sequel truncation strategy' do # XXX: it'd be really nice if Truncation accepted db: constructor parameter let(:truncation) do @@ -67,7 +67,7 @@ module DatabaseCleaner end end - shared_examples_for 'a truncation strategy without autoincrement resets' do + RSpec.shared_examples_for 'a truncation strategy without autoincrement resets' do it "leaves AUTO_INCREMENT index alone by default (BUG: it should be reset instead)" do pending # Jordan Hollinger made everything reset auto increment IDs @@ -94,7 +94,7 @@ module DatabaseCleaner end end - shared_examples_for 'a truncation strategy that resets autoincrement keys by default' do + RSpec.shared_examples_for 'a truncation strategy that resets autoincrement keys by default' do it "resets AUTO_INCREMENT primary keys" do db.create_table!(:replaceable_trifles) { primary_key :id } table = db[:replaceable_trifles] @@ -124,7 +124,7 @@ module DatabaseCleaner ] supported_configurations.each do |config| - describe "Sequel truncation (using a #{config[:url]} connection)" do + RSpec.describe "Sequel truncation (using a #{config[:url]} connection)" do around do |example| helper = SequelHelper.new(config) helper.setup @@ -183,7 +183,7 @@ module DatabaseCleaner end half_supported_configurations.each do |config| - describe "Sequel truncation (using a #{config[:url]} connection)" do + RSpec.describe "Sequel truncation (using a #{config[:url]} connection)" do around do |example| helper = SequelHelper.new(config) helper.setup diff --git a/spec/database_cleaner/shared_strategy.rb b/spec/database_cleaner/shared_strategy.rb index 1c8eb7c..a8a4ed3 100644 --- a/spec/database_cleaner/shared_strategy.rb +++ b/spec/database_cleaner/shared_strategy.rb @@ -1,14 +1,14 @@ -shared_examples_for "a generic strategy" do +RSpec.shared_examples_for "a generic strategy" do it { is_expected.to respond_to(:db) } end -shared_examples_for "a generic truncation strategy" do +RSpec.shared_examples_for "a generic truncation strategy" do it { is_expected.to respond_to(:start) } it { is_expected.to respond_to(:clean) } it { is_expected.to respond_to(:cleaning) } end -shared_examples_for "a generic transaction strategy" do +RSpec.shared_examples_for "a generic transaction strategy" do it { is_expected.to respond_to(:start) } it { is_expected.to respond_to(:clean) } it { is_expected.to respond_to(:cleaning) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0725357..b58e50e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,5 +8,7 @@ RSpec.configure do |config| # get run. config.filter_run :focus config.run_all_when_everything_filtered = true + + config.disable_monkey_patching! end