activerecord-oracle_enhanced-adapter 1.6.9 → 1.7.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -15,7 +15,7 @@ describe "Oracle Enhanced adapter database tasks" do
     end
     it "creates user" do
       query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
-      ActiveRecord::Base.connection.select_value(query).should == 1
+      expect(ActiveRecord::Base.connection.select_value(query)).to eq(1)
     end
     after do
       ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}");
@@ -42,15 +42,15 @@ describe "Oracle Enhanced adapter database tasks" do
     describe "drop" do
       before { ActiveRecord::Tasks::DatabaseTasks.drop(config) }
       it "drops all tables" do
-        ActiveRecord::Base.connection.table_exists?(:test_posts).should be false
+        expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_falsey
       end
     end
 
     describe "purge" do
       before { ActiveRecord::Tasks::DatabaseTasks.purge(config) }
       it "drops all tables" do
-        ActiveRecord::Base.connection.table_exists?(:test_posts).should be false
-        ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM RECYCLEBIN").should == 0
+        expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_falsey
+        expect(ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM RECYCLEBIN")).to eq(0)
       end
     end
 
@@ -65,8 +65,8 @@ describe "Oracle Enhanced adapter database tasks" do
         before { ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file) }
         it "dumps the database structure to a file without the schema information" do
           contents = File.read(temp_file)
-          contents.should include('CREATE TABLE "TEST_POSTS"')
-          contents.should_not include('INSERT INTO schema_migrations')
+          expect(contents).to include('CREATE TABLE "TEST_POSTS"')
+          expect(contents).not_to include('INSERT INTO schema_migrations')
         end
       end
 
@@ -77,7 +77,7 @@ describe "Oracle Enhanced adapter database tasks" do
           ActiveRecord::Tasks::DatabaseTasks.structure_load(config, temp_file)
         end
         it "loads the database structure from a file" do
-          ActiveRecord::Base.connection.table_exists?(:test_posts).should be true
+          expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_truthy
         end
       end
 

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -42,28 +42,28 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should NOT log dbms output when dbms output is disabled" do
     @conn.disable_dbms_output
 
-    @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a.should == [{'is_it_long'=>1}]
+    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{'is_it_long'=>1}])
 
-    @logger.output(:debug).should_not match(/^DBMS_OUTPUT/)
+    expect(@logger.output(:debug)).not_to match(/^DBMS_OUTPUT/)
   end
 
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a.should == [{'is_it_long'=>1}]
+    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{'is_it_long'=>1}])
     
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -hi there-$/)
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is longer than 5$/)
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 1$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -hi there-$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is longer than 5$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: about to return: 1$/)
   end
 
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    @conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a.should == [{'is_it_long'=>0}]
+    expect(@conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a).to eq([{'is_it_long'=>0}])
     
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -short-$/)
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is 5 or shorter$/)
-    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 0$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -short-$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is 5 or shorter$/)
+    expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: about to return: 0$/)
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -38,99 +38,99 @@ if ActiveRecord::Base.method_defined?(:changed?)
     it "should not mark empty string (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:first_name => '')
       @employee.first_name = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.first_name = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not mark empty integer (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:job_id => '')
       @employee.job_id = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.job_id = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not mark empty decimal (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:salary => '')
       @employee.salary = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.salary = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not mark empty text (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:comments => nil)
       @employee.comments = nil
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.comments = nil
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not mark empty text (stored as empty_clob()) as changed when reassigning it" do
       @employee = TestEmployee.create!(:comments => '')
       @employee.comments = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.comments = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should mark empty text (stored as empty_clob()) as changed when assigning nil to it" do
       @employee = TestEmployee.create!(:comments => '')
       @employee.comments = nil
-      @employee.should be_changed
+      expect(@employee).to be_changed
       @employee.reload
       @employee.comments = nil
-      @employee.should be_changed
+      expect(@employee).to be_changed
     end
 
     it "should mark empty text (stored as NULL) as changed when assigning '' to it" do
       @employee = TestEmployee.create!(:comments => nil)
       @employee.comments = ''
-      @employee.should be_changed
+      expect(@employee).to be_changed
       @employee.reload
       @employee.comments = ''
-      @employee.should be_changed
+      expect(@employee).to be_changed
     end
 
     it "should not mark empty date (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:hire_date => '')
       @employee.hire_date = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
       @employee.reload
       @employee.hire_date = ''
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not mark integer as changed when reassigning it" do
       @employee = TestEmployee.new
       @employee.job_id = 0
-      @employee.save.should be true
+      expect(@employee.save!).to be_truthy
       
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
 
       @employee.job_id = '0'
-      @employee.should_not be_changed
+      expect(@employee).not_to be_changed
     end
 
     it "should not update unchanged CLOBs" do
       @employee = TestEmployee.create!(
           :comments => "initial"
       )
-      @employee.save.should be true
+      expect(@employee.save!).to be_truthy
       @employee.reload
-      @employee.comments.should == 'initial'
+      expect(@employee.comments).to eq('initial')
 
       oci_conn = @conn.instance_variable_get('@connection')
       class << oci_conn
          def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
       end
-      expect { @employee.save! }.to_not raise_error
+      expect{@employee.save!}.not_to raise_exception(RuntimeError, "don't do this'")
       class << oci_conn
         remove_method :write_lob
       end

data/spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb

@@ -11,8 +11,8 @@ describe "OracleEnhancedAdapter emulate OracleAdapter" do
 
   it "should be an OracleAdapter" do
     @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(:emulate_oracle_adapter => true))
-    ActiveRecord::Base.connection.should_not be_nil
-    ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::OracleAdapter).should be true
+    expect(ActiveRecord::Base.connection).not_to be_nil
+    expect(ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::OracleAdapter)).to be_truthy
   end
 
   after(:all) do

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -166,12 +166,12 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @employee.reload
-    @employee.first_name.should == "First"
-    @employee.last_name.should == "Last"
-    @employee.hire_date.should == @today
-    @employee.description.should == "First Last"
-    @employee.create_time.should_not be_nil
-    @employee.update_time.should_not be_nil
+    expect(@employee.first_name).to eq("First")
+    expect(@employee.last_name).to eq("Last")
+    expect(@employee.hire_date).to eq(@today)
+    expect(@employee.description).to eq("First Last")
+    expect(@employee.create_time).not_to be_nil
+    expect(@employee.update_time).not_to be_nil
   end
 
   it "should rollback record when exception is raised in after_create callback" do
@@ -183,11 +183,11 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     employees_count = TestEmployee.count
-    lambda {
+    expect {
       @employee.save
-    }.should raise_error("Make the transaction rollback")
-    @employee.new_record?.should be true
-    TestEmployee.count.should == employees_count
+    }.to raise_error("Make the transaction rollback")
+    expect(@employee.id).to eq(nil)
+    expect(TestEmployee.count).to eq(employees_count)
   end
 
   it "should update record" do
@@ -201,7 +201,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.first_name = "Second"
     @employee.save!
     @employee.reload
-    @employee.description.should == "Second Last"
+    expect(@employee.description).to eq("Second Last")
   end
 
   it "should rollback record when exception is raised in after_update callback" do
@@ -216,11 +216,11 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     empl_id = @employee.id
     @employee.reload
     @employee.first_name = "Second"
-    lambda {
+    expect {
       @employee.save
-    }.should raise_error("Make the transaction rollback")
+    }.to raise_error("Make the transaction rollback")
     @employee.reload
-    @employee.first_name.should == "First"
+    expect(@employee.first_name).to eq("First")
   end
 
   it "should not update record if nothing is changed and partial writes are enabled" do
@@ -233,7 +233,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.reload
     @employee.save!
     @employee.reload
-    @employee.version.should == 1
+    expect(@employee.version).to eq(1)
   end
 
   it "should update record if nothing is changed and partial writes are disabled" do
@@ -246,7 +246,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.reload
     @employee.save!
     @employee.reload
-    @employee.version.should == 2
+    expect(@employee.version).to eq(2)
   end
 
   it "should delete record" do
@@ -258,8 +258,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.reload
     empl_id = @employee.id
     @employee.destroy
-    @employee.should be_frozen
-    TestEmployee.find_by_employee_id(empl_id).should be_nil
+    expect(@employee).to be_frozen
+    expect(TestEmployee.find_by_employee_id(empl_id)).to be_nil
   end
 
   it "should delete record and set destroyed flag" do
@@ -270,7 +270,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     @employee.reload
     @employee.destroy
-    @employee.should be_destroyed
+    expect(@employee).to be_destroyed
   end
 
   it "should rollback record when exception is raised in after_destroy callback" do
@@ -284,11 +284,11 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     @employee.reload
     empl_id = @employee.id
-    lambda {
+    expect {
       @employee.destroy
-    }.should raise_error("Make the transaction rollback")
-    @employee.id.should == empl_id
-    TestEmployee.find_by_employee_id(empl_id).should_not be_nil
+    }.to raise_error("Make the transaction rollback")
+    expect(@employee.id).to eq(empl_id)
+    expect(TestEmployee.find_by_employee_id(empl_id)).not_to be_nil
     clear_logger
   end
 
@@ -298,8 +298,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    @employee.created_at.should_not be_nil
-    @employee.updated_at.should_not be_nil
+    expect(@employee.created_at).not_to be_nil
+    expect(@employee.updated_at).not_to be_nil
   end
 
   it "should set timestamps when updating record" do
@@ -309,12 +309,12 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @employee.reload
-    @employee.created_at.should be_nil
-    @employee.updated_at.should be_nil
+    expect(@employee.created_at).to be_nil
+    expect(@employee.updated_at).to be_nil
     @employee.first_name = "Second"
     @employee.save!
-    @employee.created_at.should be_nil
-    @employee.updated_at.should_not be_nil
+    expect(@employee.created_at).to be_nil
+    expect(@employee.updated_at).not_to be_nil
   end
 
   it "should log create record" do
@@ -324,8 +324,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    #TODO: dirty workaround to remove sql statement for `table` method
-    @logger.logged(:debug)[-2].should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
+    expect(@logger.logged(:debug).last).to match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
     clear_logger
   end
 
@@ -338,7 +337,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     set_logger
     @employee.save!
-    @logger.logged(:debug).last.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
+    expect(@logger.logged(:debug).last).to match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
     clear_logger
   end
 
@@ -350,7 +349,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     set_logger
     @employee.destroy
-    @logger.logged(:debug).last.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
+    expect(@logger.logged(:debug).last).to match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
     clear_logger
   end
 
@@ -359,8 +358,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    @employee.save.should be false
-    @employee.errors[:first_name].should_not be_blank
+    expect(@employee.save).to be_falsey
+    expect(@employee.errors[:first_name]).not_to be_blank
   end
 
   it "should validate existing record before update" do
@@ -370,8 +369,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @employee.first_name = nil
-    @employee.save.should be false
-    @employee.errors[:first_name].should_not be_blank
+    expect(@employee.save).to be_falsey
+    expect(@employee.errors[:first_name]).not_to be_blank
   end
   
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -43,12 +43,12 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not include ignored table names in schema dump" do
       create_test_posts_table
-      standard_dump(ignore_tables: %w(test_posts)).should_not =~ /create_table "test_posts"/
+      expect(standard_dump(ignore_tables: %w(test_posts))).not_to match(/create_table "test_posts"/)
     end
 
     it "should not include ignored table regexes in schema dump" do
       create_test_posts_table
-      standard_dump(ignore_tables: [ /test_posts/i ]).should_not =~ /create_table "test_posts"/
+      expect(standard_dump(ignore_tables: [ /test_posts/i ])).not_to match(/create_table "test_posts"/)
     end
 
   end
@@ -70,7 +70,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should be able to dump default values using special characters" do
-      standard_dump.should =~ /t.string \"special_c\", default: "\\n"/
+      expect(standard_dump).to match(/t.string \"special_c\", default: "\\n"/)
     end
   end
   describe "table prefixes and suffixes" do
@@ -84,37 +84,37 @@ describe "OracleEnhancedAdapter schema dump" do
     it "should remove table prefix in schema dump" do
       ActiveRecord::Base.table_name_prefix = 'xxx_'
       create_test_posts_table
-      standard_dump.should =~ /create_table "test_posts".*add_index "test_posts"/m
+      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
     end
 
     it "should remove table prefix with $ sign in schema dump" do
       ActiveRecord::Base.table_name_prefix = 'xxx$'
       create_test_posts_table
-      standard_dump.should =~ /create_table "test_posts".*add_index "test_posts"/m
+      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
     end
 
     it "should remove table suffix in schema dump" do
       ActiveRecord::Base.table_name_suffix = '_xxx'
       create_test_posts_table
-      standard_dump.should =~ /create_table "test_posts".*add_index "test_posts"/m
+      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
     end
 
     it "should remove table suffix with $ sign in schema dump" do
       ActiveRecord::Base.table_name_suffix = '$xxx'
       create_test_posts_table
-      standard_dump.should =~ /create_table "test_posts".*add_index "test_posts"/m
+      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
     end
 
     it "should not include schema_migrations table with prefix in schema dump" do
       ActiveRecord::Base.table_name_prefix = 'xxx_'
       @conn.initialize_schema_migrations_table
-      standard_dump.should_not =~ /schema_migrations/
+      expect(standard_dump).not_to match(/schema_migrations/)
     end
 
     it "should not include schema_migrations table with suffix in schema dump" do
       ActiveRecord::Base.table_name_suffix = '_xxx'
       @conn.initialize_schema_migrations_table
-      standard_dump.should_not =~ /schema_migrations/
+      expect(standard_dump).not_to match(/schema_migrations/)
     end
 
   end
@@ -126,7 +126,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include non-default primary key in schema dump" do
       create_test_posts_table(primary_key: 'post_id')
-      standard_dump.should =~ /create_table "test_posts", primary_key: "post_id"/
+      expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
 
   end
@@ -140,12 +140,12 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include primary key trigger in schema dump" do
       create_test_posts_table(primary_key_trigger: true)
-      standard_dump.should =~ /create_table "test_posts".*add_primary_key_trigger "test_posts"/m
+      expect(standard_dump).to match(/create_table "test_posts".*add_primary_key_trigger "test_posts"/m)
     end
 
     it "should include primary key trigger with non-default primary key in schema dump" do
       create_test_posts_table(primary_key_trigger: true, primary_key: 'post_id')
-      standard_dump.should =~ /create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m
+      expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m)
     end
 
   end
@@ -180,49 +180,49 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts"/
+      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts"/)
     end
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :delete
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :cascade/
+      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :cascade/)
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :nullify
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :nullify/
+      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :nullify/)
     end
 
     it "should not include foreign keys on ignored table names in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(ignore_tables: %w(test_comments)).should_not =~ /add_foreign_key "test_comments"/
+      expect(standard_dump(ignore_tables: %w(test_comments))).not_to match(/add_foreign_key "test_comments"/)
     end
 
     it "should not include foreign keys on ignored table regexes in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(ignore_tables: [ /test_comments/i ]).should_not =~ /add_foreign_key "test_comments"/
+      expect(standard_dump(ignore_tables: [ /test_comments/i ])).not_to match(/add_foreign_key "test_comments"/)
     end
 
     it "should include foreign keys referencing ignored table names in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(ignore_tables: %w(test_posts)).should =~ /add_foreign_key "test_comments"/
+      expect(standard_dump(ignore_tables: %w(test_posts))).to match(/add_foreign_key "test_comments"/)
     end
 
     it "should include foreign keys referencing ignored table regexes in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(ignore_tables: [ /test_posts/i ]).should =~ /add_foreign_key "test_comments"/
+      expect(standard_dump(ignore_tables: [ /test_posts/i ])).to match(/add_foreign_key "test_comments"/)
     end
 
     it "should include composite foreign keys" do
@@ -241,7 +241,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
         add_foreign_key :test_comments, :test_posts, columns: ["baz_id", "fooz_id"], name: 'comments_posts_baz_fooz_fk'
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", columns: \["baz_id", "fooz_id"\], name: "comments_posts_baz_fooz_fk"/
+      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", columns: \["baz_id", "fooz_id"\], name: "comments_posts_baz_fooz_fk"/)
     end
     it "should include foreign keys following all tables" do
       # if foreign keys preceed declaration of all tables
@@ -250,7 +250,7 @@ describe "OracleEnhancedAdapter schema dump" do
         add_foreign_key :test_comments, :test_posts
       end
       dump = standard_dump
-      dump.rindex("create_table").should < dump.index("add_foreign_key")
+      expect(dump.rindex("create_table")).to be < dump.index("add_foreign_key")
     end
  
     it "should include primary_key when reference column name is not 'id'" do
@@ -269,7 +269,7 @@ describe "OracleEnhancedAdapter schema dump" do
         ADD CONSTRAINT TEST_COMMENTS_BAZ_ID_FK FOREIGN KEY (baz_id) REFERENCES test_posts(baz_id)
       SQL
 
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/
+      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/)
     end
     
   end
@@ -285,35 +285,35 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump.should =~ /add_synonym "test_synonym", "schema_name.table_name", force: true/
+      expect(standard_dump).to match(/add_synonym "test_synonym", "schema_name.table_name", force: true/)
     end
 
     it "should include synonym to other database table in schema dump" do
       schema_define do
         add_synonym :test_synonym, "table_name@link_name", force: true
       end
-      standard_dump.should =~ /add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", force: true/
+      expect(standard_dump).to match(/add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", force: true/)
     end
 
     it "should not include ignored table names in schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(ignore_tables: %w(test_synonym)).should_not =~ /add_synonym "test_synonym"/
+      expect(standard_dump(ignore_tables: %w(test_synonym))).not_to match(/add_synonym "test_synonym"/)
     end
 
     it "should not include ignored table regexes in schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(ignore_tables: [ /test_synonym/i ]).should_not =~ /add_synonym "test_synonym"/
+      expect(standard_dump(ignore_tables: [ /test_synonym/i ])).not_to match(/add_synonym "test_synonym"/)
     end
 
     it "should include synonyms to ignored table regexes in schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(ignore_tables: [ /table_name/i ]).should =~ /add_synonym "test_synonym"/
+      expect(standard_dump(ignore_tables: [ /table_name/i ])).to match(/add_synonym "test_synonym"/)
     end
 
   end
@@ -325,7 +325,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include temporary options" do
       create_test_posts_table(temporary: true)
-      standard_dump.should =~ /create_table "test_posts", temporary: true/
+      expect(standard_dump).to match(/create_table "test_posts", temporary: true/)
     end
   end
 
@@ -336,20 +336,20 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not specify default tablespace in add index" do
       create_test_posts_table
-      standard_dump.should =~ /add_index "test_posts", \["title"\], name: "index_test_posts_on_title"$/
+      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title"$/)
     end
 
     it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
-      @conn.stub(:default_tablespace).and_return('dummy')
+      allow(@conn).to receive(:default_tablespace).and_return('dummy')
       create_test_posts_table
-      standard_dump.should =~ /add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/
+      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
     end
 
     it "should create and dump function-based indexes" do
       create_test_posts_table
       @conn.add_index :test_posts, "NVL(created_at, updated_at)", name: "index_test_posts_cr_upd_at"
-      standard_dump.should =~ /add_index "test_posts", \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/
+      expect(standard_dump).to match(/add_index "test_posts", \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
     end
 
   end
@@ -363,7 +363,7 @@ describe "OracleEnhancedAdapter schema dump" do
     it "should not include materialized views in schema dump" do
       create_test_posts_table
       @conn.execute "CREATE MATERIALIZED VIEW test_posts_mv AS SELECT * FROM test_posts"
-      standard_dump.should_not =~ /create_table "test_posts_mv"/
+      expect(standard_dump).not_to match(/create_table "test_posts_mv"/)
     end
   end
 
@@ -401,12 +401,12 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it 'should dump correctly' do
-      standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)as:(.*),(\s*)type: :integer/
-      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
-      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
+      expect(standard_dump).to match(/t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/)
+      expect(standard_dump).to match(/t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/)
+      expect(standard_dump).to match(/t\.virtual "full_name_length",(\s*)precision: 38,(\s*)as:(.*),(\s*)type: :integer/)
+      expect(standard_dump).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
+      expect(standard_dump).to match(/t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/)
+      expect(standard_dump).to match(/t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/)
     end
 
     context 'with column cache' do
@@ -419,14 +419,14 @@ describe "OracleEnhancedAdapter schema dump" do
       end
       it 'should not change column defaults after several dumps' do
         col = TestName.columns.detect{|c| c.name == 'full_name'}
-        col.should_not be_nil
-        col.virtual_column_data_default.should_not =~ /:as/
+        expect(col).not_to be_nil
+        expect(col.virtual_column_data_default).not_to match(/:as/)
 
         standard_dump
-        col.virtual_column_data_default.should_not =~ /:as/
+        expect(col.virtual_column_data_default).not_to match(/:as/)
 
         standard_dump
-        col.virtual_column_data_default.should_not =~ /:as/
+        expect(col.virtual_column_data_default).not_to match(/:as/)
       end
     end
 
@@ -446,8 +446,8 @@ describe "OracleEnhancedAdapter schema dump" do
         end
       end
       it 'should dump correctly' do
-        standard_dump.should_not =~ /add_index "test_names".+FIRST_NAME.+$/
-        standard_dump.should     =~ /add_index "test_names".+field_with_leading_space.+$/
+        expect(standard_dump).not_to match(/add_index "test_names".+FIRST_NAME.+$/)
+        expect(standard_dump).to     match(/add_index "test_names".+field_with_leading_space.+$/)
       end
     end
   end
@@ -468,7 +468,47 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump float type correctly" do
-      standard_dump.should =~ /t\.float "hourly_rate"$/
+      expect(standard_dump).to match(/t\.float "hourly_rate"$/)
+    end
+  end
+
+  describe "table comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_table_comments, :comment => "this is a \"table comment\"!", force: true do |t|
+          t.string :blah
+        end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_table_comments
+      end
+    end
+
+    it "should dump table comments" do
+      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+    end
+  end
+
+  describe "column comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_column_comments, force: true do |t|
+          t.string :blah, :comment => "this is a \"column comment\"!"
+        end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_column_comments
+      end
+    end
+
+    it "should dump column comments" do
+      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
     end
   end