capybara 2.0.0.beta2 → 2.0.0.beta4

data/lib/capybara/spec/session/unselect_spec.rb

@@ -1,67 +1,72 @@
-shared_examples_for "unselect" do
-  describe "#unselect" do
-    before do
-      @session.visit('/form')
+Capybara::SpecHelper.spec "#unselect" do
+  before do
+    @session.visit('/form')
+  end
+
+  context "with multiple select" do
+    it "should unselect an option from a select box by id" do
+      @session.unselect('Commando', :from => 'form_underwear')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
+      extract_results(@session)['underwear'].should_not include('Commando')
     end
 
-    context "with multiple select" do
-      it "should unselect an option from a select box by id" do
-        @session.unselect('Commando', :from => 'form_underwear')
-        @session.click_button('awesome')
-        extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
-        extract_results(@session)['underwear'].should_not include('Commando')
-      end
+    it "should unselect an option without a select box" do
+      @session.unselect('Commando')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
+      extract_results(@session)['underwear'].should_not include('Commando')
+    end
 
-      it "should unselect an option without a select box" do
-        @session.unselect('Commando')
-        @session.click_button('awesome')
-        extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
-        extract_results(@session)['underwear'].should_not include('Commando')
-      end
+    it "should unselect an option from a select box by label" do
+      @session.unselect('Commando', :from => 'Underwear')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
+      extract_results(@session)['underwear'].should_not include('Commando')
+    end
 
-      it "should unselect an option from a select box by label" do
-        @session.unselect('Commando', :from => 'Underwear')
-        @session.click_button('awesome')
-        extract_results(@session)['underwear'].should include('Briefs', 'Boxerbriefs')
-        extract_results(@session)['underwear'].should_not include('Commando')
-      end
+    it "should favour exact matches to option labels" do
+      @session.unselect("Briefs", :from => 'Underwear')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should include('Commando', 'Boxerbriefs')
+      extract_results(@session)['underwear'].should_not include('Briefs')
+    end
 
-      it "should favour exact matches to option labels" do
-        @session.unselect("Briefs", :from => 'Underwear')
-        @session.click_button('awesome')
-        extract_results(@session)['underwear'].should include('Commando', 'Boxerbriefs')
-        extract_results(@session)['underwear'].should_not include('Briefs')
-      end
+    it "should escape quotes" do
+      @session.unselect("Frenchman's Pantalons", :from => 'Underwear')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should_not include("Frenchman's Pantalons")
+    end
 
-      it "should escape quotes" do
-        @session.unselect("Frenchman's Pantalons", :from => 'Underwear')
-        @session.click_button('awesome')
-        extract_results(@session)['underwear'].should_not include("Frenchman's Pantalons")
-      end
+    it "casts to string" do
+      @session.unselect(:"Briefs", :from => :'Underwear')
+      @session.click_button('awesome')
+      extract_results(@session)['underwear'].should include('Commando', 'Boxerbriefs')
+      extract_results(@session)['underwear'].should_not include('Briefs')
     end
+  end
 
-    context "with single select" do
-      it "should raise an error" do
-        running { @session.unselect("English", :from => 'form_locale') }.should raise_error(Capybara::UnselectNotAllowed)
-      end
+  context "with single select" do
+    it "should raise an error" do
+      expect { @session.unselect("English", :from => 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
     end
+  end
 
-    context "with a locator that doesn't exist" do
-      it "should raise an error" do
-        msg = "Unable to find select box \"does not exist\""
-        running do
-          @session.unselect('foo', :from => 'does not exist')
-        end.should raise_error(Capybara::ElementNotFound, msg)
-      end
+  context "with a locator that doesn't exist" do
+    it "should raise an error" do
+      msg = "Unable to find select box \"does not exist\""
+      expect do
+        @session.unselect('foo', :from => 'does not exist')
+      end.to raise_error(Capybara::ElementNotFound, msg)
     end
+  end
 
-    context "with an option that doesn't exist" do
-      it "should raise an error" do
-        msg = "Unable to find option \"Does not Exist\""
-        running do
-          @session.unselect('Does not Exist', :from => 'form_underwear')
-        end.should raise_error(Capybara::ElementNotFound, msg)
-      end
+  context "with an option that doesn't exist" do
+    it "should raise an error" do
+      msg = "Unable to find option \"Does not Exist\""
+      expect do
+        @session.unselect('Does not Exist', :from => 'form_underwear')
+      end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 end

data/lib/capybara/spec/session/visit_spec.rb

@@ -1,76 +1,74 @@
-shared_examples_for "visit" do
-  describe '#visit' do
-    it "should fetch a response from the driver with a relative url" do
-      @session.visit('/')
-      @session.body.should include('Hello world!')
-      @session.visit('/foo')
-      @session.body.should include('Another World')
-    end
+Capybara::SpecHelper.spec '#visit' do
+  it "should fetch a response from the driver with a relative url" do
+    @session.visit('/')
+    @session.should have_content('Hello world!')
+    @session.visit('/foo')
+    @session.should have_content('Another World')
+  end
 
-    it "should fetch a response from the driver with an absolute url with a port" do
-      # Preparation
-      @session.visit('/')
-      root_uri = URI.parse(@session.current_url)
+  it "should fetch a response from the driver with an absolute url with a port" do
+    # Preparation
+    @session.visit('/')
+    root_uri = URI.parse(@session.current_url)
 
-      @session.visit("http://#{root_uri.host}:#{root_uri.port}/")
-      @session.body.should include('Hello world!')
-      @session.visit("http://#{root_uri.host}:#{root_uri.port}/foo")
-      @session.body.should include('Another World')
-    end
+    @session.visit("http://#{root_uri.host}:#{root_uri.port}/")
+    @session.should have_content('Hello world!')
+    @session.visit("http://#{root_uri.host}:#{root_uri.port}/foo")
+    @session.should have_content('Another World')
+  end
 
-    context "when Capybara.always_include_port is true" do
+  context "when Capybara.always_include_port is true" do
 
-      let(:root_uri) do
-        @session.visit('/')
-        URI.parse(@session.current_url)
-      end
+    let(:root_uri) do
+      @session.visit('/')
+      URI.parse(@session.current_url)
+    end
 
-      before(:each) do
-        Capybara.always_include_port = true
-      end
+    before(:each) do
+      Capybara.always_include_port = true
+    end
 
-      after(:each) do
-        Capybara.always_include_port = false
-      end
+    after(:each) do
+      Capybara.always_include_port = false
+    end
 
-      it "should fetch a response from the driver with an absolute url without a port" do
-        @session.visit("http://#{root_uri.host}/")
-        URI.parse(@session.current_url).port.should == root_uri.port
-        @session.body.should include('Hello world!')
+    it "should fetch a response from the driver with an absolute url without a port" do
+      @session.visit("http://#{root_uri.host}/")
+      URI.parse(@session.current_url).port.should == root_uri.port
+      @session.should have_content('Hello world!')
 
-        @session.visit("http://#{root_uri.host}/foo")
-        URI.parse(@session.current_url).port.should == root_uri.port
-        @session.body.should include('Another World')
-      end
+      @session.visit("http://#{root_uri.host}/foo")
+      URI.parse(@session.current_url).port.should == root_uri.port
+      @session.should have_content('Another World')
     end
+  end
 
-    it "should send no referer when visiting a page" do
-      @session.visit '/get_referer'
-      @session.body.should include 'No referer'
-    end
+  it "should send no referer when visiting a page" do
+    @session.visit '/get_referer'
+    @session.should have_content 'No referer'
+  end
 
-    it "should send no referer when visiting a second page" do
-      @session.visit '/get_referer'
-      @session.visit '/get_referer'
-      @session.body.should include 'No referer'
-    end
+  it "should send no referer when visiting a second page" do
+    @session.visit '/get_referer'
+    @session.visit '/get_referer'
+    @session.should have_content 'No referer'
+  end
 
-    it "should send a referer when following a link" do
-      @session.visit '/referer_base'
-      @session.find('//a[@href="/get_referer"]').click
-      @session.body.should match %r{http://.*/referer_base}
-    end
+  it "should send a referer when following a link" do
+    @session.visit '/referer_base'
+    @session.find('//a[@href="/get_referer"]').click
+    @session.body.should match %r{http://.*/referer_base}
+  end
 
-    it "should preserve the original referer URL when following a redirect" do
-      @session.visit('/referer_base')
-      @session.find('//a[@href="/redirect_to_get_referer"]').click
-      @session.body.should match %r{http://.*/referer_base}
-    end
+  it "should preserve the original referer URL when following a redirect" do
+    @session.visit('/referer_base')
+    @session.find('//a[@href="/redirect_to_get_referer"]').click
+    @session.body.should match %r{http://.*/referer_base}
+  end
 
-    it "should send a referer when submitting a form" do
-      @session.visit '/referer_base'
-      @session.find('//input').click
-      @session.body.should match %r{http://.*/referer_base}
-    end
+  it "should send a referer when submitting a form" do
+    @session.visit '/referer_base'
+    @session.find('//input').click
+    @session.body.should match %r{http://.*/referer_base}
   end
 end

data/lib/capybara/spec/session/within_frame_spec.rb

@@ -1,33 +1,31 @@
-shared_examples_for "session with frame support" do
-  describe '#within_frame' do
-    before(:each) do
-      @session.visit('/within_frames')
-    end
+Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
+  before(:each) do
+    @session.visit('/within_frames')
+  end
 
-    it "should find the div in frameOne" do
-      @session.within_frame("frameOne") do
-        @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
-      end
+  it "should find the div in frameOne" do
+    @session.within_frame("frameOne") do
+      @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
     end
-    it "should find the div in FrameTwo" do
-      @session.within_frame("frameTwo") do
-        @session.find("//*[@id='divInFrameTwo']").text.should eql 'This is the text of divInFrameTwo'
-      end
-    end
-    it "should find the text div in the main window after finding text in frameOne" do
-      @session.within_frame("frameOne") do
-        @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
-      end
-      @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
+  end
+  it "should find the div in FrameTwo" do
+    @session.within_frame("frameTwo") do
+      @session.find("//*[@id='divInFrameTwo']").text.should eql 'This is the text of divInFrameTwo'
     end
-    it "should find the text div in the main window after finding text in frameTwo" do
-      @session.within_frame("frameTwo") do
-        @session.find("//*[@id='divInFrameTwo']").text.should eql 'This is the text of divInFrameTwo'
-      end
-      @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
+  end
+  it "should find the text div in the main window after finding text in frameOne" do
+    @session.within_frame("frameOne") do
+      @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
     end
-    it "should return the result of executing the block" do
-      @session.within_frame("frameOne") { "return value" }.should eql "return value"
+    @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
+  end
+  it "should find the text div in the main window after finding text in frameTwo" do
+    @session.within_frame("frameTwo") do
+      @session.find("//*[@id='divInFrameTwo']").text.should eql 'This is the text of divInFrameTwo'
     end
+    @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
+  end
+  it "should return the result of executing the block" do
+    @session.within_frame("frameOne") { "return value" }.should eql "return value"
   end
 end

data/lib/capybara/spec/session/within_spec.rb

@@ -1,167 +1,165 @@
-shared_examples_for "within" do
-  describe '#within' do
-    before do
-      @session.visit('/with_scope')
+Capybara::SpecHelper.spec '#within' do
+  before do
+    @session.visit('/with_scope')
+  end
+
+  context "with CSS selector" do
+    it "should click links in the given scope" do
+      @session.within(:css, "#for_bar li[contains('With Simple HTML')]") do
+        @session.click_link('Go')
+      end
+      @session.should have_content('Bar')
     end
 
-    context "with CSS selector" do
-      it "should click links in the given scope" do
-        @session.within(:css, "#for_bar li[contains('With Simple HTML')]") do
-          @session.click_link('Go')
-        end
-        @session.body.should include('Bar')
+    it "should assert content in the given scope" do
+      @session.within(:css, "#for_foo") do
+        @session.should_not have_content('First Name')
       end
+      @session.should have_content('First Name')
+    end
 
-      it "should assert content in the given scope" do
-        @session.within(:css, "#for_foo") do
-          @session.should_not have_content('First Name')
-        end
-        @session.should have_content('First Name')
+    it "should accept additional options" do
+      @session.within(:css, "#for_bar li", :text => 'With Simple HTML') do
+        @session.click_link('Go')
       end
+      @session.should have_content('Bar')
+    end
+  end
 
-      it "should accept additional options" do
-        @session.within(:css, "#for_bar li", :text => 'With Simple HTML') do
-          @session.click_link('Go')
-        end
-        @session.body.should include('Bar')
+  context "with XPath selector" do
+    it "should click links in the given scope" do
+      @session.within(:xpath, "//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
+        @session.click_link('Go')
       end
+      @session.should have_content('Bar')
     end
+  end
 
-    context "with XPath selector" do
-      it "should click links in the given scope" do
-        @session.within(:xpath, "//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
-          @session.click_link('Go')
-        end
-        @session.body.should include('Bar')
+  context "with the default selector" do
+    it "should use XPath" do
+      @session.within("//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
+        @session.click_link('Go')
       end
+      @session.should have_content('Bar')
     end
+  end
 
-    context "with the default selector" do
-      it "should use XPath" do
-        @session.within("//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
-          @session.click_link('Go')
-        end
-        @session.body.should include('Bar')
+  context "with Node rather than selector" do
+    it "should click links in the given scope" do
+      node_of_interest = @session.find(:css, "#for_bar li[contains('With Simple HTML')]")
+
+      @session.within(node_of_interest) do
+        @session.click_link('Go')
       end
+      @session.should have_content('Bar')
     end
+  end
 
-    context "with Node rather than selector" do
-      it "should click links in the given scope" do
-        node_of_interest = @session.find(:css, "#for_bar li[contains('With Simple HTML')]")
+  context "with the default selector set to CSS" do
+    before { Capybara.default_selector = :css }
+    it "should use CSS" do
+      @session.within("#for_bar li[contains('With Simple HTML')]") do
+        @session.click_link('Go')
+      end
+      @session.should have_content('Bar')
+    end
+    after { Capybara.default_selector = :xpath }
+  end
 
-        @session.within(node_of_interest) do
+  context "with nested scopes" do
+    it "should respect the inner scope" do
+      @session.within("//div[@id='for_bar']") do
+        @session.within(".//li[contains(.,'Bar')]") do
           @session.click_link('Go')
         end
-        @session.body.should include('Bar')
       end
+      @session.should have_content('Another World')
     end
 
-    context "with the default selector set to CSS" do
-      before { Capybara.default_selector = :css }
-      it "should use CSS" do
-        @session.within("#for_bar li[contains('With Simple HTML')]") do
+    it "should respect the outer scope" do
+      @session.within("//div[@id='another_foo']") do
+        @session.within(".//li[contains(.,'With Simple HTML')]") do
           @session.click_link('Go')
         end
-        @session.body.should include('Bar')
       end
-      after { Capybara.default_selector = :xpath }
+      @session.should have_content('Hello world')
     end
+  end
 
-    context "with nested scopes" do
-      it "should respect the inner scope" do
-        @session.within("//div[@id='for_bar']") do
-          @session.within(".//li[contains(.,'Bar')]") do
-            @session.click_link('Go')
-          end
-        end
-        @session.body.should include('Another World')
+  it "should raise an error if the scope is not found on the page" do
+    expect do
+      @session.within("//div[@id='doesnotexist']") do
       end
+    end.to raise_error(Capybara::ElementNotFound)
+  end
 
-      it "should respect the outer scope" do
-        @session.within("//div[@id='another_foo']") do
-          @session.within(".//li[contains(.,'With Simple HTML')]") do
-            @session.click_link('Go')
-          end
-        end
-        @session.body.should include('Hello world')
+  it "should restore the scope when an error is raised" do
+    expect do
+      @session.within("//div[@id='for_bar']") do
+        expect do
+          expect do
+            @session.within(".//div[@id='doesnotexist']") do
+            end
+          end.to raise_error(Capybara::ElementNotFound)
+        end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
       end
-    end
-
-    it "should raise an error if the scope is not found on the page" do
-      running do
-        @session.within("//div[@id='doesnotexist']") do
-        end
-      end.should raise_error(Capybara::ElementNotFound)
-    end
+    end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
+  end
 
-    it "should restore the scope when an error is raised" do
-      running do
-        @session.within("//div[@id='for_bar']") do
-          running do
-            running do
-              @session.within(".//div[@id='doesnotexist']") do
-              end
-            end.should raise_error(Capybara::ElementNotFound)
-          end.should_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
-        end
-      end.should_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
+  it "should fill in a field and click a button" do
+    @session.within("//li[contains(.,'Bar')]") do
+      @session.click_button('Go')
     end
-
-    it "should fill in a field and click a button" do
-      @session.within("//li[contains(.,'Bar')]") do
-        @session.click_button('Go')
-      end
-      extract_results(@session)['first_name'].should == 'Peter'
-      @session.visit('/with_scope')
-      @session.within("//li[contains(.,'Bar')]") do
-        @session.fill_in('First Name', :with => 'Dagobert')
-        @session.click_button('Go')
-      end
-      extract_results(@session)['first_name'].should == 'Dagobert'
+    extract_results(@session)['first_name'].should == 'Peter'
+    @session.visit('/with_scope')
+    @session.within("//li[contains(.,'Bar')]") do
+      @session.fill_in('First Name', :with => 'Dagobert')
+      @session.click_button('Go')
     end
+    extract_results(@session)['first_name'].should == 'Dagobert'
   end
+end
 
-  describe '#within_fieldset' do
-    before do
-      @session.visit('/fieldsets')
-    end
+Capybara::SpecHelper.spec '#within_fieldset' do
+  before do
+    @session.visit('/fieldsets')
+  end
 
-    it "should restrict scope to a fieldset given by id" do
-      @session.within_fieldset("villain_fieldset") do
-        @session.fill_in("Name", :with => 'Goldfinger')
-        @session.click_button("Create")
-      end
-      extract_results(@session)['villain_name'].should == 'Goldfinger'
+  it "should restrict scope to a fieldset given by id" do
+    @session.within_fieldset("villain_fieldset") do
+      @session.fill_in("Name", :with => 'Goldfinger')
+      @session.click_button("Create")
     end
+    extract_results(@session)['villain_name'].should == 'Goldfinger'
+  end
 
-    it "should restrict scope to a fieldset given by legend" do
-      @session.within_fieldset("Villain") do
-        @session.fill_in("Name", :with => 'Goldfinger')
-        @session.click_button("Create")
-      end
-      extract_results(@session)['villain_name'].should == 'Goldfinger'
+  it "should restrict scope to a fieldset given by legend" do
+    @session.within_fieldset("Villain") do
+      @session.fill_in("Name", :with => 'Goldfinger')
+      @session.click_button("Create")
     end
+    extract_results(@session)['villain_name'].should == 'Goldfinger'
   end
+end
 
-  describe '#within_table' do
-    before do
-      @session.visit('/tables')
-    end
+Capybara::SpecHelper.spec '#within_table' do
+  before do
+    @session.visit('/tables')
+  end
 
-    it "should restrict scope to a fieldset given by id" do
-      @session.within_table("girl_table") do
-        @session.fill_in("Name", :with => 'Christmas')
-        @session.click_button("Create")
-      end
-      extract_results(@session)['girl_name'].should == 'Christmas'
+  it "should restrict scope to a fieldset given by id" do
+    @session.within_table("girl_table") do
+      @session.fill_in("Name", :with => 'Christmas')
+      @session.click_button("Create")
     end
+    extract_results(@session)['girl_name'].should == 'Christmas'
+  end
 
-    it "should restrict scope to a fieldset given by legend" do
-      @session.within_table("Villain") do
-        @session.fill_in("Name", :with => 'Quantum')
-        @session.click_button("Create")
-      end
-      extract_results(@session)['villain_name'].should == 'Quantum'
+  it "should restrict scope to a fieldset given by legend" do
+    @session.within_table("Villain") do
+      @session.fill_in("Name", :with => 'Quantum')
+      @session.click_button("Create")
     end
+    extract_results(@session)['villain_name'].should == 'Quantum'
   end
 end