@@ -68,7 +68,3 @@ module Wink end end - -# DEPRECATED: The top-level Database constant will be removed before the next -# release. -Database = Wink::Schema lib/wink/schema.rb @@ -79,18 +79,3 @@ describe 'Rack::Request#remote_ip' do end end - - -describe 'Database (DEPRECATED)' do - - it 'is defined' do - Object.const_defined?(:Database).should.be.truthful - end - - it 'responds to ::configure, ::create!, and ::drop!' do - Database.should.respond_to :configure - Database.should.respond_to :create! - Database.should.respond_to :drop! - end - -end test/core_extensions_test.rb @@ -14,7 +14,7 @@ require 'wink' require 'sinatra/test/unit' require 'sinatra/test/spec' -Database.configure 'sqlite3::memory:' +Wink::Schema.configure 'sqlite3::memory:' Wink.configure do set :env, :test @@ -26,11 +26,11 @@ end class Test::Unit::TestCase def setup_database - Database.create! :force => true + Wink::Schema.create! :force => true end def teardown_database - Database.drop! + Wink::Schema.drop! end # Assert that the given constant is defined. The const_name may include test/help.rb @@ -33,18 +33,3 @@ describe 'Wink::Schema' do end end - - -describe 'Database (DEPRECATED)' do - - it 'is defined' do - Object.const_defined?(:Database).should.be.truthful - end - - it 'responds to ::configure, ::create!, and ::drop!' do - Database.should.respond_to :configure - Database.should.respond_to :create! - Database.should.respond_to :drop! - end - -end test/schema_test.rb 4c7208465a54106b8c1b85bb6ed997e864483b2a Markus Prinz markus.prinz@nuclearsquid.com http://github.com/rtomayko/wink/commit/036fbf03a241889ab6233bdef4538320468c8d13 036fbf03a241889ab6233bdef4538320468c8d13 2008-11-02T11:19:00-08:00 2008-11-02T11:19:00-08:00 Remove Database constant 3ae797a825a0a21e13d7ea5a0f8159844577ff3a Markus Prinz markus.prinz@nuclearsquid.com