diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb index 028e89c8..b0f0eb3a 100644 --- a/spec/dsl_spec.rb +++ b/spec/dsl_spec.rb @@ -2,14 +2,11 @@ require 'spec_helper' require 'capybara/dsl' describe Capybara::DSL do - before do - Capybara.app = TestApp - end - after do Capybara.session_name = nil Capybara.default_driver = nil Capybara.use_default_driver + Capybara.app = TestApp end describe '#default_driver' do diff --git a/spec/rspec/features_spec.rb b/spec/rspec/features_spec.rb index 05daf830..078f8aee 100644 --- a/spec/rspec/features_spec.rb +++ b/spec/rspec/features_spec.rb @@ -7,7 +7,6 @@ end feature "Capybara's feature DSL" do background do - Capybara.app = TestApp @in_background = true end diff --git a/spec/rspec/matchers_spec.rb b/spec/rspec/matchers_spec.rb index 3580c769..822702f1 100644 --- a/spec/rspec/matchers_spec.rb +++ b/spec/rspec/matchers_spec.rb @@ -6,10 +6,6 @@ describe Capybara::RSpecMatchers do include Capybara::DSL include Capybara::RSpecMatchers - before :each do - Capybara.app = TestApp - end - describe "have_css matcher" do it "gives proper description" do have_css('h1').description.should == "has css \"h1\"" diff --git a/spec/rspec_spec.rb b/spec/rspec_spec.rb index c5798eb8..5721b6ee 100644 --- a/spec/rspec_spec.rb +++ b/spec/rspec_spec.rb @@ -1,10 +1,6 @@ require 'spec_helper' describe 'capybara/rspec', :type => :request do - before :each do - Capybara.app = TestApp - end - it "should include Capybara in rspec" do visit('/foo') page.body.should include('Another World') @@ -43,14 +39,12 @@ end describe 'capybara/rspec', :type => :other do it "should not include Capybara" do - Capybara.app = TestApp expect { visit('/') }.to raise_error(NoMethodError) end end feature "Feature DSL" do scenario "is pulled in" do - Capybara.app = TestApp visit('/foo') page.body.should include('Another World') end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c2df2349..f5de5303 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,6 +22,7 @@ require 'capybara/spec/session' alias :running :lambda +Capybara.app = TestApp Capybara.default_wait_time = 0 # less timeout so tests run faster module TestSessions