aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 13:39:03 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 13:39:03 -0700
commitc56e6204dbc622f40745e6e5f22172b435e3b962 (patch)
treedd5df6a21b8a87857d2bba530669c154f51a7026 /activerecord/test
parent17077639c2805d2f40b579215c2e1fa7b9951e5c (diff)
parent524ce560ffc6b696acb780f7fe8474f552d5f795 (diff)
downloadrails-c56e6204dbc622f40745e6e5f22172b435e3b962.tar.gz
rails-c56e6204dbc622f40745e6e5f22172b435e3b962.tar.bz2
rails-c56e6204dbc622f40745e6e5f22172b435e3b962.zip
Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_test
Restore columns dropped by hstore test
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/adapters/postgresql/hstore_test.rb20
1 files changed, 5 insertions, 15 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 410119adc1..e434b4861c 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -40,25 +40,15 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
assert @connection.extensions.include?('hstore'), "extension list should include hstore"
end
- def test_hstore_enabled
+ def test_disable_enable_hstore
assert @connection.extension_enabled?('hstore')
- end
-
- def test_disable_hstore
- if @connection.extension_enabled?('hstore')
- @connection.disable_extension 'hstore'
- assert_not @connection.extension_enabled?('hstore')
- end
- end
-
- def test_enable_hstore
- if @connection.extension_enabled?('hstore')
- @connection.disable_extension 'hstore'
- end
-
+ @connection.disable_extension 'hstore'
assert_not @connection.extension_enabled?('hstore')
@connection.enable_extension 'hstore'
assert @connection.extension_enabled?('hstore')
+ ensure
+ # Restore column(s) dropped by `drop extension hstore cascade;`
+ load_schema
end
def test_column