sequel 4.49.0 → 5.0.0

data/spec/extensions/identifier_mangling_spec.rb

@@ -1,14 +1,6 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "identifier_mangling extension" do
-  after do
-    deprecated do
-      Sequel.quote_identifiers = false
-      Sequel.identifier_input_method = nil
-      Sequel.identifier_output_method = nil
-    end
-  end
-  
   it "should respect the :quote_identifiers option" do
     db = Sequel::Database.new(:quote_identifiers=>false).extension(:identifier_mangling)
     db.quote_identifiers?.must_equal false
@@ -18,78 +10,37 @@ describe "identifier_mangling extension" do
 
   it "should respect the :quote_identifiers setting" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.quote_identifiers?.must_equal false
-    db.quote_identifiers = true
     db.quote_identifiers?.must_equal true
+    db.quote_identifiers = false
+    db.quote_identifiers?.must_equal false
   end
 
   it "should upcase on input and downcase on output by default" do
-    # SEQUEL5: Remove :identifier_mangling=>false
-    db = Sequel::Database.new(:identifier_mangling=>false).extension(:identifier_mangling)
+    db = Sequel::Database.new.extension(:identifier_mangling)
     db.send(:identifier_input_method_default).must_equal :upcase
     db.send(:identifier_output_method_default).must_equal :downcase
   end
 
   it "should respect the :identifier_input_method option" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :downcase
-    db.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_input_method=>nil).extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :downcase
-    db.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_input_method=>:upcase).extension(:identifier_mangling)
     db.identifier_input_method.must_equal :upcase
     db.identifier_input_method = nil
     db.identifier_input_method.must_be_nil
-  end
-  
-  deprecated "should default to Sequel.identifier_input_method" do
-    Sequel.identifier_input_method = :downcase
-    Sequel::Database.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_equal :downcase
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
     db = Sequel::Database.new(:identifier_input_method=>nil).extension(:identifier_mangling)
     db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
+    db.identifier_input_method = :downcase
+    db.identifier_input_method.must_equal :downcase
     db = Sequel::Database.new(:identifier_input_method=>:upcase).extension(:identifier_mangling)
     db.identifier_input_method.must_equal :upcase
     db.identifier_input_method = nil
     db.identifier_input_method.must_be_nil
-    Sequel.identifier_input_method = nil
-    Sequel::Database.identifier_input_method.must_equal false
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
   end
   
   it "should respect the :identifier_output_method option" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :upcase
-    db.identifier_output_method.must_equal :upcase
-    db = Sequel::Database.new(:identifier_output_method=>nil).extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :downcase
     db.identifier_output_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_output_method=>:upcase).extension(:identifier_mangling)
-    db.identifier_output_method.must_equal :upcase
     db.identifier_output_method = nil
     db.identifier_output_method.must_be_nil
-  end
-
-  deprecated "should default to Sequel.identifier_output_method" do
-    Sequel.identifier_output_method = :upcase
-    Sequel::Database.identifier_output_method.must_equal :upcase
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_equal :upcase
-    db.identifier_output_method = :downcase
-    db.identifier_output_method.must_equal :downcase
     db = Sequel::Database.new(:identifier_output_method=>nil).extension(:identifier_mangling)
     db.identifier_output_method.must_be_nil
     db.identifier_output_method = :downcase
@@ -98,56 +49,8 @@ describe "identifier_mangling extension" do
     db.identifier_output_method.must_equal :upcase
     db.identifier_output_method = nil
     db.identifier_output_method.must_be_nil
-    Sequel.identifier_output_method = nil
-    Sequel::Database.identifier_output_method.must_equal false
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :downcase
-    db.identifier_output_method.must_equal :downcase
-  end
-
-  deprecated "should use the default Sequel.quote_identifiers value" do
-    Sequel.quote_identifiers = true
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    Sequel.quote_identifiers = false
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-    Sequel::Database.quote_identifiers = true
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    Sequel::Database.quote_identifiers = false
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-  end
-
-  deprecated "should use the default Sequel.identifier_input_method value" do
-    Sequel.identifier_input_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :downcase
-    Sequel.identifier_input_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :upcase
-    Sequel::Database.identifier_input_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :downcase
-    Sequel::Database.identifier_input_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :upcase
-  end
-  
-  deprecated "should use the default Sequel.identifier_output_method value" do
-    Sequel.identifier_output_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :downcase
-    Sequel.identifier_output_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :upcase
-    Sequel::Database.identifier_output_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :downcase
-    Sequel::Database.identifier_output_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :upcase
   end
 
-  deprecated "should respect the quote_indentifiers_default method if Sequel.quote_identifiers = nil" do
-    Sequel.quote_identifiers = nil
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    x = Class.new(Sequel::Database){def dataset_class_default; Sequel::Dataset end; def quote_identifiers_default; false end}
-    x.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-    y = Class.new(Sequel::Database){def dataset_class_default; Sequel::Dataset end; def quote_identifiers_default; true end}
-    y.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-  end
-  
   it "should respect the identifier_input_method_default method if Sequel.identifier_input_method is not called" do
     class Sequel::Database
       @identifier_input_method = nil
@@ -172,6 +75,7 @@ end
 describe "Database#input_identifier_meth" do
   it "should be the input_identifer method of a default dataset for this database" do
     db = Sequel::Database.new.extension(:identifier_mangling)
+    db.identifier_input_method = nil
     db.send(:input_identifier_meth).call(:a).must_equal 'a'
     db.identifier_input_method = :upcase
     db.send(:input_identifier_meth).call(:a).must_equal 'A'
@@ -181,6 +85,7 @@ end
 describe "Database#output_identifier_meth" do
   it "should be the output_identifer method of a default dataset for this database" do
     db = Sequel::Database.new.extension(:identifier_mangling)
+    db.identifier_output_method = nil
     db.send(:output_identifier_meth).call('A').must_equal :A
     db.identifier_output_method = :downcase
     db.send(:output_identifier_meth).call('A').must_equal :a
@@ -190,7 +95,7 @@ end
 describe "Database#metadata_dataset" do
   it "should be a dataset with the default settings for identifier_mangling" do
     ds = Sequel::Database.new.extension(:identifier_mangling).send(:metadata_dataset)
-    ds.literal(:a).must_equal 'A'
+    ds.literal(:a).must_equal "\"A\""
     ds.send(:output_identifier, 'A').must_equal :a
   end
 end
@@ -221,35 +126,6 @@ describe "Dataset" do
     db[:a].identifier_output_method.must_equal :downcase
   end
   
-  # SEQUEL5: Remove
-  unless Sequel.mock(:identifier_mangling=>true).dataset.frozen?
-    deprecated "should have quote_identifiers= method which changes literalization of identifiers" do
-      @dataset.quote_identifiers = true
-      @dataset.literal(:a).must_equal '"a"'
-      @dataset.quote_identifiers = false
-      @dataset.literal(:a).must_equal 'a'
-    end
-    
-    deprecated "should have identifier_input_method= method which changes literalization of identifiers" do
-      @dataset.identifier_input_method = :upcase
-      @dataset.literal(:a).must_equal 'A'
-      @dataset.identifier_input_method = :downcase
-      @dataset.literal(:A).must_equal 'a'
-      @dataset.identifier_input_method = :reverse
-      @dataset.literal(:at_b).must_equal 'b_ta'
-    end
-    
-    deprecated "should have identifier_output_method= method which changes identifiers returned from the database" do
-      @dataset.send(:output_identifier, "at_b_C").must_equal :at_b_C
-      @dataset.identifier_output_method = :upcase
-      @dataset.send(:output_identifier, "at_b_C").must_equal :AT_B_C
-      @dataset.identifier_output_method = :downcase
-      @dataset.send(:output_identifier, "at_b_C").must_equal :at_b_c
-      @dataset.identifier_output_method = :reverse
-      @dataset.send(:output_identifier, "at_b_C").must_equal :C_b_ta
-    end
-  end
-  
   it "should have with_quote_identifiers method which returns cloned dataset with changed literalization of identifiers" do
     @dataset.with_quote_identifiers(true).literal(:a).must_equal '"a"'
     @dataset.with_quote_identifiers(false).literal(:a).must_equal 'a'
@@ -285,45 +161,16 @@ describe "Dataset" do
   end
 end
 
-describe "Frozen Datasets" do
-  before do
-    @ds = Sequel.mock(:identifier_mangling=>true)[:test].freeze
-  end
-
-  deprecated "should raise an error when calling mutation methods" do
-    proc{@ds.identifier_input_method = :a}.must_raise RuntimeError
-    proc{@ds.identifier_output_method = :a}.must_raise RuntimeError
-    proc{@ds.quote_identifiers = false}.must_raise RuntimeError
-  end
-end
-
 describe "identifier_mangling extension" do
   it "should be able to load dialects based on the database name" do
-    begin
-      qi, ii, io = nil
-      deprecated do
-        qi = class Sequel::Database; @quote_identifiers; end
-        ii = class Sequel::Database; @identifier_input_method; end
-        io = class Sequel::Database; @identifier_output_method; end
-        Sequel.quote_identifiers = nil
-        class Sequel::Database; @identifier_input_method=nil; end
-        class Sequel::Database; @identifier_output_method=nil; end
-      end
-      Sequel.mock(:host=>'access').select(Date.new(2011, 12, 13)).sql.must_equal 'SELECT #2011-12-13#'
-      Sequel.mock(:host=>'db2').select(1).sql.must_equal 'SELECT 1 FROM "SYSIBM"."SYSDUMMY1"'
-      Sequel.mock(:host=>'mssql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM [A] WHERE (CONTAINS ([B], 'c'))"
-      Sequel.mock(:host=>'mysql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM `a` WHERE (MATCH (`b`) AGAINST ('c'))"
-      Sequel.mock(:host=>'oracle')[:a].limit(1).sql.must_equal 'SELECT * FROM (SELECT * FROM "A") "T1" WHERE (ROWNUM <= 1)'
-      Sequel.mock(:host=>'postgres')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM \"a\" WHERE (to_tsvector(CAST('simple' AS regconfig), (COALESCE(\"b\", ''))) @@ to_tsquery(CAST('simple' AS regconfig), 'c'))"
-      Sequel.mock(:host=>'sqlanywhere').from(:a).offset(1).sql.must_equal 'SELECT TOP 2147483647 START AT (1 + 1) * FROM "A"'
-      Sequel.mock(:host=>'sqlite')[Sequel[:a].as(:b)].sql.must_equal "SELECT * FROM `a` AS 'b'"
-    ensure
-      deprecated do
-        Sequel.quote_identifiers = qi
-        Sequel::Database.send(:instance_variable_set, :@identifier_input_method, ii)
-        Sequel::Database.send(:instance_variable_set, :@identifier_output_method, io)
-      end
-    end
+    Sequel.mock(:host=>'access').select(Date.new(2011, 12, 13)).sql.must_equal 'SELECT #2011-12-13#'
+    Sequel.mock(:host=>'db2').select(1).sql.must_equal 'SELECT 1 FROM "SYSIBM"."SYSDUMMY1"'
+    Sequel.mock(:host=>'mssql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM [A] WHERE (CONTAINS ([B], 'c'))"
+    Sequel.mock(:host=>'mysql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM `a` WHERE (MATCH (`b`) AGAINST ('c'))"
+    Sequel.mock(:host=>'oracle')[:a].limit(1).sql.must_equal 'SELECT * FROM (SELECT * FROM "A") "T1" WHERE (ROWNUM <= 1)'
+    Sequel.mock(:host=>'postgres')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM \"a\" WHERE (to_tsvector(CAST('simple' AS regconfig), (COALESCE(\"b\", ''))) @@ to_tsquery(CAST('simple' AS regconfig), 'c'))"
+    Sequel.mock(:host=>'sqlanywhere').from(:a).offset(1).sql.must_equal 'SELECT TOP 2147483647 START AT (1 + 1) * FROM "A"'
+    Sequel.mock(:host=>'sqlite')[Sequel[:a].as(:b)].sql.must_equal "SELECT * FROM `a` AS 'b'"
   end
 end
 

data/spec/extensions/implicit_subquery_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Dataset::ImplicitSubquery" do
   it "should implicitly use a subquery for most dataset query methods" do
@@ -9,10 +9,6 @@ describe "Sequel::Dataset::ImplicitSubquery" do
     ods = db[:c]
     ods.columns(:id, :b)
 
-    deprecated do
-      ds.and(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 WHERE c"
-      ds.exclude_where(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 WHERE NOT c"
-    end
     ds.cross_join(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 CROSS JOIN c"
     ds.distinct.sql.must_equal "SELECT DISTINCT * FROM (SELECT * FROM table) AS t1"
     ds.except(ods).sql.must_equal "SELECT * FROM (SELECT * FROM (SELECT * FROM table) AS t1 EXCEPT SELECT * FROM c) AS t1"

data/spec/extensions/inflector_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :inflector
 

data/spec/extensions/input_transformer_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::InputTransformer" do
   before do
@@ -15,6 +15,12 @@ describe "Sequel::Plugins::InputTransformer" do
     @o.name.must_equal [1, 2, 3]
   end
 
+  it "should have working .input_transformer_order" do
+    @c.input_transformer_order.must_equal [:reverser]
+    @c.plugin(:input_transformer, :reverser2){|v| v.is_a?(String) ? v.reverse : v}
+    @c.input_transformer_order.must_equal [:reverser2, :reverser]
+  end
+
   it "should not apply any transformers by default" do
     c = Class.new(Sequel::Model)
     c.columns :name, :b
@@ -56,7 +62,6 @@ describe "Sequel::Plugins::InputTransformer" do
     @c.skip_input_transformer :reverser, :name
     @c.freeze
     @c.input_transformers.frozen?.must_equal true
-    @c.input_transformer_order.frozen?.must_equal true
     skip = @c.instance_variable_get(:@skip_input_transformer_columns)
     skip.frozen?.must_equal true
     skip.values.all?(&:frozen?).must_equal true

data/spec/extensions/insert_returning_select_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::InsertReturningSelect" do
   before do

data/spec/extensions/instance_filters_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "instance_filters plugin" do
   before do

data/spec/extensions/instance_hooks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "InstanceHooks plugin" do
   def r(x=nil)
@@ -25,17 +25,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_create_hook block returns false" do
-    @o.after_create_hook{r 1}
-    @o.before_create_hook{r false}
-    @o.before_create_hook{r 4}
-    @o.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @o.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_create_hook block calls cancel_action" do
     @o.after_create_hook{r 1}
     @o.before_create_hook{r{@o.cancel_action}}
@@ -58,17 +47,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_update_hook block returns false" do
-    @x.after_update_hook{r 1}
-    @x.before_update_hook{r false}
-    @x.before_update_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_update_hook block calls cancel_action" do
     @x.after_update_hook{r 1}
     @x.before_update_hook{r{@x.cancel_action}}
@@ -99,24 +77,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_save_hook block returns false" do
-    @x.after_save_hook{r 1}
-    @x.before_save_hook{r false}
-    @x.before_save_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    
-    @x.after_save_hook{r 1}
-    @x.before_save_hook{r false}
-    @x.before_save_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_save_hook block calls cancel_action" do
     @x.after_save_hook{r 1}
     @x.before_save_hook{r{@x.cancel_action}}
@@ -144,14 +104,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the destroy if before_destroy_hook block returns false" do
-    @x.after_destroy_hook{r 1}
-    @x.before_destroy_hook{r false}
-    @x.before_destroy_hook{r 4}
-    @x.destroy.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the destroy if before_destroy_hook block calls cancel_action" do
     @x.after_destroy_hook{r 1}
     @x.before_destroy_hook{r{@x.cancel_action}}
@@ -169,17 +121,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_validation_hook block returns false" do
-    @o.after_validation_hook{r 1}
-    @o.before_validation_hook{r false}
-    @o.before_validation_hook{r 4}
-    @o.valid?.must_equal false
-    @r.must_equal [4, false]
-    @r.clear
-    @o.valid?.must_equal false
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_validation_hook block calls cancel_action" do
     @o.after_validation_hook{r 1}
     @o.before_validation_hook{r{@o.cancel_action}}
@@ -289,34 +230,6 @@ describe "InstanceHooks plugin with transactions" do
     @db.sqls
   end
   
-  deprecated "should support after_commit_hook" do
-    @o.after_commit_hook{@db.execute('ac1')}
-    @o.after_commit_hook{@db.execute('ac2')}
-    @o.save.wont_equal nil
-    @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
-  end
-  
-  deprecated "should support after_rollback_hook" do
-    @or.after_rollback_hook{@db.execute('ar1')}
-    @or.after_rollback_hook{@db.execute('ar2')}
-    @or.save.must_be_nil
-    @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
-  end
-  
-  deprecated "should support after_destroy_commit_hook" do
-    @o.after_destroy_commit_hook{@db.execute('adc1')}
-    @o.after_destroy_commit_hook{@db.execute('adc2')}
-    @o.destroy.wont_equal nil
-    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
-  end
-  
-  deprecated "should support after_destroy_rollback_hook" do
-    @or.after_destroy_rollback_hook{@db.execute('adr1')}
-    @or.after_destroy_rollback_hook{@db.execute('adr2')}
-    @or.destroy.must_be_nil
-    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'ROLLBACK', 'adr1', 'adr2']
-  end
-
   it "should have *_hook methods return self "do
     @o.before_destroy_hook{r 1}.must_be_same_as(@o)
     @o.before_validation_hook{r 1}.must_be_same_as(@o)
@@ -329,12 +242,5 @@ describe "InstanceHooks plugin with transactions" do
     @o.after_save_hook{r 1}.must_be_same_as(@o)
     @o.after_update_hook{r 1}.must_be_same_as(@o)
     @o.after_create_hook{r 1}.must_be_same_as(@o)
-    deprecated do
-      @o.after_commit_hook{r 1}.must_be_same_as(@o)
-      @o.after_rollback_hook{r 1}.must_be_same_as(@o)
-      @o.after_destroy_commit_hook{r 1}.must_be_same_as(@o)
-      @o.after_destroy_rollback_hook{r 1}.must_be_same_as(@o)
-    end
   end
-
 end