diff --git a/lib/capybara/config.rb b/lib/capybara/config.rb index 226226c3..497dff99 100644 --- a/lib/capybara/config.rb +++ b/lib/capybara/config.rb @@ -80,18 +80,6 @@ module Capybara @javascript_driver || :selenium end - # @deprecated Use default_max_wait_time instead - def default_wait_time - deprecate('default_wait_time', 'default_max_wait_time', true) - default_max_wait_time - end - - # @deprecated Use default_max_wait_time= instead - def default_wait_time=(t) - deprecate('default_wait_time=', 'default_max_wait_time=') - self.default_max_wait_time = t - end - def deprecate(method, alternate_method, once=false) @deprecation_notified ||= {} warn "DEPRECATED: ##{method} is deprecated, please use ##{alternate_method} instead" unless once and @deprecation_notified[method] diff --git a/spec/capybara_spec.rb b/spec/capybara_spec.rb index e6d78e5d..17adfa77 100644 --- a/spec/capybara_spec.rb +++ b/spec/capybara_spec.rb @@ -12,15 +12,6 @@ RSpec.describe Capybara do Capybara.default_max_wait_time = 5 expect(Capybara.default_max_wait_time).to eq(5) end - - it "should be accesible as the deprecated default_wait_time" do - expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead') - expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead') - @previous_default_time = Capybara.default_max_wait_time - Capybara.default_wait_time = 5 - expect(Capybara.default_wait_time).to eq(5) - expect(Capybara.default_max_wait_time).to eq(5) - end end describe '.register_driver' do