cleanup specs

Author: urkle

spec/column_default_spec.rb

@@ -1,18 +1,8 @@
 require 'spec_helper'
 
 describe "Column definition" do
-  def stub_model(name, base = ActiveRecord::Base, &block)
-    klass = Class.new(base)
-
-    if block_given?
-      klass.instance_eval(&block)
-    end
-
-    stub_const(name, klass)
-  end
-
   before(:each) do
-    define_schema do
+    apply_migration do
       create_table :models, :force => true do |t|
       end
     end
@@ -125,8 +115,8 @@ def stub_model(name, base = ActiveRecord::Base, &block)
   private
 
   def define_test_column(type, **options)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
+    apply_migration do
+      create_table Model.table_name, :force => true do |t|
         t.send type, :test_column, **options
         t.integer :dummy
       end

spec/migration_spec.rb

@@ -3,41 +3,37 @@
 describe ActiveRecord::Migration do
 
   before(:each) do
-    define_schema do
+    apply_migration do
       create_table :posts, :force => true do |t|
         t.string :content
       end
     end
-    class Post < ::ActiveRecord::Base ; end
   end
 
   context "when table is created" do
-
-    before(:each) do
-      @model = Post
-    end
+    let(:model) { stub_model('Post') }
 
     it "should properly handle default values for booleans" do
       expect {
-        recreate_table(@model) do |t|
+        recreate_table(model) do |t|
           t.boolean :bool, :default => true
         end
       }.to_not raise_error
-      expect(@model.create.reload.bool).to be true
+      expect(model.create.reload.bool).to be true
     end
 
     it "should properly handle default values for json (#195)", :postgresql => :only do
-      recreate_table(@model) do |t|
+      recreate_table(model) do |t|
         t.json :json, :default => {}
       end
-      expect(@model.create.reload.json).to eq({})
+      expect(model.create.reload.json).to eq({})
     end
 
   end
 
   def recreate_table(model, opts={}, &block)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, **opts.merge(:force => true), &block
+    apply_migration do
+      create_table model.table_name, **opts.merge(:force => true), &block
     end
     model.reset_column_information
   end

spec/schema_dumper_spec.rb

@@ -2,93 +2,92 @@
 require 'stringio'
 
 describe "Schema dump" do
+  let(:model) { stub_model('Post') }
 
-  before(:all) do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, force: :cascade end
-
+  context "with date default", :postgresql => :only do
+    before do
+      apply_migration do
         create_table :posts, :force => true do |t|
-          t.text :body
-          t.integer :user_id
-          t.integer :first_comment_id
-          t.string :string_no_default
-          t.integer :short_id
-          t.string :str_short
-          t.integer :integer_col
-          t.float :float_col
-          t.decimal :decimal_col
-          t.datetime :datetime_col
-          t.timestamp :timestamp_col
-          t.time :time_col
-          t.date :date_col
-          t.binary :binary_col
-          t.boolean :boolean_col
         end
-
       end
     end
-    class ::Post < ActiveRecord::Base ; end
-  end
 
-  context "with date default", :postgresql => :only do
     it "should dump the default hash expr as now()" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
+      with_additional_column model, :posted_at, :datetime, :default => :now do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}\s*$})
       end
     end
 
     it "should dump the default hash expr as CURRENT_TIMESTAMP" do
-      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
+      with_additional_column model, :posted_at, :datetime, :default => { :expr => 'date \'2001-09-28\'' } do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>).*2001-09-28.*})
       end
     end
+  end
+
+  context 'with a complex expression', postgresql: :only do
+    before do
+      apply_migration do
+        create_table :posts, :force => true do |t|
+        end
+      end
+    end
 
     it "can dump a complex default expression" do
-      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
+      with_additional_column model, :name, :string, :default => { :expr => 'substring(random()::text from 3 for 6)' } do
         expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
       end
     end
   end
 
   context "with date default", :sqlite3 => :only do
+    before do
+      apply_migration do
+        create_table :posts, :force => true do |t|
+        end
+      end
+    end
+
     it "should dump the default hash expr as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
+      with_additional_column model, :posted_at, :datetime, :default => :now do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
     end
 
     it "should dump the default hash expr string as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
+      with_additional_column model, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
     end
 
     it "should dump the default value normally" do
-      with_additional_column Post, :posted_at, :string, :default => "now" do
+      with_additional_column model, :posted_at, :string, :default => "now" do
         expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default\s*=>)\s*"now"})
       end
     end
   end
 
   it "should leave out :default when default was changed to null" do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
+    apply_migration do
+      create_table :posts, :force => true do |t|
+        t.datetime :date_column, default: { expr: :now }
+      end
+
+      change_column_default :posts, :date_column, nil
     end
-    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
-    # make sure the full line doesn't have 'default' in it.
-    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
+    expect(dump_posts).to match(%r{t\.datetime\s+"date_column"$})
   end
 
   protected
+
   def to_regexp(string)
     Regexp.new(Regexp.escape(string))
   end
 
   def with_additional_column(model, column_name, column_type, options)
-    table_columns = model.columns.reject{|column| column.name == 'id'}
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
+    table_columns = model.columns.reject { |column| column.name == 'id' }
+    apply_migration do
+      create_table model.table_name, :force => true do |t|
         table_columns.each do |column|
           t.column column.name, column.type, :default => column.default
         end
@@ -98,8 +97,8 @@ def with_additional_column(model, column_name, column_type, options)
     yield
   end
 
-  def dump_schema(opts={})
-    stream = StringIO.new
+  def dump_schema(opts = {})
+    stream                                   = StringIO.new
     ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore]) || []
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string
@@ -110,4 +109,3 @@ def dump_posts
   end
 
 end
-

spec/spec_helper.rb

@@ -15,18 +15,36 @@
 
 RSpec.configure do |config|
   config.warnings = true
+
+  config.around do |example|
+    begin
+      example.run
+    ensure
+      apply_migration do
+        ActiveRecord::Base.connection.tables.each do |table|
+          drop_table table, force: :cascade
+        end
+      end
+    end
+  end
 end
 
-def define_schema(&block)
+def stub_model(name, base = ActiveRecord::Base, &block)
+  klass = Class.new(base)
+
+  if block_given?
+    klass.instance_eval(&block)
+  end
+
+  stub_const(name, klass)
+end
+
+def apply_migration(&block)
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define do
-      connection.tables.each do |table|
-        drop_table table, force: :cascade
-      end
       instance_eval &block
     end
   end
 end
 
-
 SimpleCov.command_name "[ruby#{RUBY_VERSION}-activerecord#{::ActiveRecord.version}-#{ActiveRecord::Base.connection.adapter_name}]"