capybara 0.3.9 → 0.4.0.rc

data/lib/capybara/spec/driver.rb

@@ -1,9 +1,5 @@
 require 'capybara/spec/test_app'
 
-Dir[File.dirname(__FILE__)+'/driver/*'].each { |group|
-  require group
-}
-
 shared_examples_for 'driver' do
 
   describe '#visit' do
@@ -18,11 +14,6 @@ shared_examples_for 'driver' do
       @driver.visit('/foo')
       @driver.current_url.should include('/foo')
     end
-
-    it 'should show the correct location' do
-      @driver.visit('/foo')
-      @driver.current_path.should == '/foo'
-    end
   end
 
   describe '#body' do
@@ -49,11 +40,8 @@ shared_examples_for 'driver' do
       end
 
       it "should extract node attributes" do
-        @driver.find('//a')[0][:href].should == '/with_simple_html'
         @driver.find('//a')[0][:class].should == 'simple'
-        @driver.find('//a')[1][:href].should == '/foo'
         @driver.find('//a')[1][:id].should == 'foo'
-        @driver.find('//a')[1][:rel].should be_nil
       end
 
       it "should extract boolean node attributes" do
@@ -84,26 +72,6 @@ shared_examples_for 'driver' do
       end
     end
   end
-
-  describe "node relative searching" do
-    before do
-      @driver.visit('/tables')
-      @node = @driver.find('//body').first
-    end
-
-    it "should be able to navigate/search child node" do
-      @node.all('//table').size.should == 5
-      @node.find('//form').all('.//table').size.should == 1
-      @node.find('//form').find('.//table//caption').text.should == 'Agent'
-      if @driver.class == Capybara::Driver::Selenium
-        pending("Selenium gets this wrong, see http://code.google.com/p/selenium/issues/detail?id=403") do
-          @node.find('//form').all('//table').size.should == 5
-        end
-      else
-        @node.find('//form').all('//table').size.should == 5
-      end
-    end
-  end
 end
 
 shared_examples_for "driver with javascript support" do
@@ -117,10 +85,11 @@ shared_examples_for "driver with javascript support" do
 
   describe '#drag_to' do
     it "should drag and drop an object" do
+      pending "drag/drop is currently broken under celerity/culerity" if @driver.is_a?(Capybara::Driver::Celerity)
       draggable = @driver.find('//div[@id="drag"]').first
       droppable = @driver.find('//div[@id="drop"]').first
       draggable.drag_to(droppable)
-      @driver.find('//div[contains(., "Dropped!")]').should_not be_nil
+      @driver.find('//div[contains(., "Dropped!")]').should_not be_empty
     end
   end
 
@@ -185,8 +154,49 @@ shared_examples_for "driver with frame support" do
   end
 end
 
+shared_examples_for "driver with support for window switching" do
+  describe '#within_window' do
+    before(:each) do
+      @driver.visit('/within_popups')
+    end
+    after(:each) do
+      @driver.within_window("firstPopup") do
+        @driver.evaluate_script('window.close()')
+      end
+      @driver.within_window("secondPopup") do
+        @driver.evaluate_script('window.close()')
+      end
+    end
+
+    it "should find the div in firstPopup" do
+      @driver.within_window("firstPopup") do
+        @driver.find("//*[@id='divInPopupOne']")[0].text.should eql 'This is the text of divInPopupOne'
+      end
+    end
+    it "should find the div in secondPopup" do
+      @driver.within_window("secondPopup") do
+        @driver.find("//*[@id='divInPopupTwo']")[0].text.should eql 'This is the text of divInPopupTwo'
+      end
+    end
+    it "should find the divs in both popups" do
+      @driver.within_window("secondPopup") do
+        @driver.find("//*[@id='divInPopupTwo']")[0].text.should eql 'This is the text of divInPopupTwo'
+      end
+      @driver.within_window("firstPopup") do
+        @driver.find("//*[@id='divInPopupOne']")[0].text.should eql 'This is the text of divInPopupOne'
+      end
+    end
+    it "should find the div in the main window after finding a div in a popup" do
+      @driver.within_window("secondPopup") do
+        @driver.find("//*[@id='divInPopupTwo']")[0].text.should eql 'This is the text of divInPopupTwo'
+      end
+      @driver.find("//*[@id='divInMainWindow']")[0].text.should eql 'This is the text for divInMainWindow'
+    end
+  end
+end
+
 shared_examples_for "driver with cookies support" do
-  describe "#cleanup" do
+  describe "#reset!" do
     it "should set and clean cookies" do
       @driver.visit('/get_cookie')
       @driver.body.should_not include('test_cookie')
@@ -197,7 +207,7 @@ shared_examples_for "driver with cookies support" do
       @driver.visit('/get_cookie')
       @driver.body.should include('test_cookie')
 
-      @driver.cleanup!
+      @driver.reset!
       @driver.visit('/get_cookie')
       @driver.body.should_not include('test_cookie')
     end

data/lib/capybara/spec/public/test.js

@@ -11,7 +11,7 @@ $(function() {
   $('#clickable').click(function() {
     var link = $(this);
     setTimeout(function() {
-      $(link).after('<a href="#">Has been clicked</a>');
+      $(link).after('<a id="has-been-clicked" href="#">Has been clicked</a>');
       $(link).after('<input type="submit" value="New Here">');
       $(link).after('<input type="text" id="new_field">');
       $('#change').remove();

data/lib/capybara/spec/session.rb

@@ -1,15 +1,17 @@
 require 'capybara/spec/test_app'
 require 'nokogiri'
 
-Dir[File.dirname(__FILE__)+'/session/*'].each { |group| 
-  require group
-}
+Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }
 
 shared_examples_for "session" do
   def extract_results(session)
     YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text
   end
 
+  after do
+    @session.reset!
+  end
+
   describe '#app' do
     it "should remember the application" do
       @session.app.should == TestApp
@@ -24,14 +26,14 @@ shared_examples_for "session" do
       @session.body.should include('Another World')
     end
   end
-  
+
   describe '#body' do
     it "should return the unmodified page body" do
       @session.visit('/')
       @session.body.should include('Hello world!')
     end
   end
-  
+
   describe '#source' do
     it "should return the unmodified page source" do
       @session.visit('/')
@@ -39,57 +41,11 @@ shared_examples_for "session" do
     end
   end
 
-  describe '#scope_to' do
-    let(:scope) { @session.scope_to("//p[@id='first']") }
-    let(:more_scope) { scope.scope_to("//a[@id='foo']") }
-
-    before do
-      @session.visit('/with_html')
-    end
-
-    it 'has a simple link' do
-      scope.should have_xpath("//a[@class='simple']")
-    end
-
-    it 'does not have a redirect link' do
-      scope.should have_no_xpath("//a[@id='red']")
-    end
-
-    it 'does have a redirect link' do
-      @session.should have_xpath("//a[@id='red']")
-    end
-
-    it 'does not share scopes' do
-      @session.should have_xpath("//a[@id='red']")
-      scope.should have_no_xpath("//a[@id='red']")
-      @session.should have_xpath("//a[@id='red']")
-    end
-
-    context 'more_scope' do
-      it 'has the text for foo' do
-        more_scope.should have_content('ullamco')
-      end
-
-      it 'does not have a simple link' do
-        more_scope.should have_no_xpath("//a[@class='simple']")
-      end
-
-      it 'has not overridden scope' do
-        scope.should have_xpath("//a[@class='simple']")
-      end
-
-      it 'has not overridden session' do
-        @session.should have_xpath("//p[@id='second']")
-      end
-    end
-
-  end
-
   it_should_behave_like "all"
   it_should_behave_like "attach_file"
   it_should_behave_like "check"
   it_should_behave_like "choose"
-  it_should_behave_like "click"
+  it_should_behave_like "click_link_or_button"
   it_should_behave_like "click_button"
   it_should_behave_like "click_link"
   it_should_behave_like "fill_in"
@@ -101,6 +57,7 @@ shared_examples_for "session" do
   it_should_behave_like "has_content"
   it_should_behave_like "has_css"
   it_should_behave_like "has_css"
+  it_should_behave_like "has_selector"
   it_should_behave_like "has_xpath"
   it_should_behave_like "has_link"
   it_should_behave_like "has_button"
@@ -110,9 +67,27 @@ shared_examples_for "session" do
   it_should_behave_like "select"
   it_should_behave_like "uncheck"
   it_should_behave_like "unselect"
-  it_should_behave_like "locate"
   it_should_behave_like "within"
   it_should_behave_like "current_url"
+
+  it "should encode complex field names, like array[][value]" do
+    @session.visit('/form')
+    @session.fill_in('address1_city', :with =>'Paris')
+    @session.fill_in('address1_street', :with =>'CDG')
+    @session.fill_in('address2_city', :with => 'Mikolaiv')
+    @session.fill_in('address2_street', :with => 'PGS')
+    @session.click_button "awesome"
+
+    addresses=extract_results(@session)["addresses"]
+    addresses.should have(2).addresses
+
+    addresses[0]["street"].should == 'CDG'
+    addresses[0]["city"].should   == 'Paris'
+
+    addresses[1]["street"].should == 'PGS'
+    addresses[1]["city"].should   == 'Mikolaiv'
+  end
+
 end
 
 

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

@@ -16,16 +16,20 @@ shared_examples_for "all" do
 
     it "should accept an XPath instance" do
       @session.visit('/form')
-      @xpath = Capybara::XPath.text_field('Name')
+      @xpath = XPath::HTML.fillable_field('Name')
       @result = @session.all(@xpath).map { |r| r.value }
       @result.should include('Smith', 'John', 'John Smith')
     end
 
     context "with css selectors" do
-      it "should find the first element using the given locator" do
+      it "should find all elements using the given selector" do
         @session.all(:css, 'h1').first.text.should == 'This is a test'
         @session.all(:css, "input[id='test_field']").first[:value].should == 'monkey'
       end
+
+      it "should find all elements when given a list of selectors" do
+        @session.all(:css, 'h1, p').should have(4).elements
+      end
     end
 
     context "with xpath selectors" do
@@ -61,7 +65,7 @@ shared_examples_for "all" do
 
       it "should find any element using the given locator" do
         @session.within(:xpath, "//div[@id='for_bar']") do
-          @session.all('//li').should have(2).elements
+          @session.all('.//li').should have(2).elements
         end
       end
     end

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

@@ -1,67 +1,65 @@
-module CheckSpec
-  shared_examples_for "check" do
-  
-    describe "#check" do
-      before do
-        @session.visit('/form')
+shared_examples_for "check" do
+
+  describe "#check" do
+    before do
+      @session.visit('/form')
+    end
+    
+    describe "'checked' attribute" do
+      it "should be true if checked" do
+        @session.check("Terms of Use")
+        @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_true
       end
       
-      describe "'checked' attribute" do
-        it "should be true if checked" do
-          @session.check("Terms of Use")
-          @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_true
-        end
-        
-        it "should be false if unchecked" do
-          @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_false
-        end
+      it "should be false if unchecked" do
+        @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_false
       end
+    end
 
-      describe "checking" do
-        it "should not change an already checked checkbox" do
-          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
-          @session.check('form_pets_dog')
-          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
-        end
-
-        it "should check an unchecked checkbox" do
-          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
-          @session.check('form_pets_cat')
-          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_true
-        end
+    describe "checking" do
+      it "should not change an already checked checkbox" do
+        @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+        @session.check('form_pets_dog')
+        @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
       end
 
-      describe "unchecking" do
-        it "should not change an already unchecked checkbox" do
-          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
-          @session.uncheck('form_pets_cat')
-          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
-        end
-
-        it "should uncheck a checked checkbox" do
-          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
-          @session.uncheck('form_pets_dog')
-          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_false
-        end
+      it "should check an unchecked checkbox" do
+        @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+        @session.check('form_pets_cat')
+        @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_true
       end
+    end
 
-      it "should check a checkbox by id" do
-        @session.check("form_pets_cat")
-        @session.click_button('awesome')
-        extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    describe "unchecking" do
+      it "should not change an already unchecked checkbox" do
+        @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+        @session.uncheck('form_pets_cat')
+        @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
       end
 
-      it "should check a checkbox by label" do
-        @session.check("Cat")
-        @session.click_button('awesome')
-        extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+      it "should uncheck a checked checkbox" do
+        @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+        @session.uncheck('form_pets_dog')
+        @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_false
       end
+    end
+
+    it "should check a checkbox by id" do
+      @session.check("form_pets_cat")
+      @session.click_button('awesome')
+      extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    end
+
+    it "should check a checkbox by label" do
+      @session.check("Cat")
+      @session.click_button('awesome')
+      extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    end
 
-      context "with a locator that doesn't exist" do
-        it "should raise an error" do
-          running { @session.check('does not exist') }.should raise_error(Capybara::ElementNotFound)
-        end
+    context "with a locator that doesn't exist" do
+      it "should raise an error" do
+        running { @session.check('does not exist') }.should raise_error(Capybara::ElementNotFound)
       end
     end
   end
-end  
+end

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

@@ -99,6 +99,15 @@ shared_examples_for "click_button" do
         it "should not serialize a select tag without options" do
           @results['tendency'].should be_nil
         end
+
+        it "should not submit disabled fields" do
+          @results['disabled_text_field'].should be_nil
+          @results['disabled_textarea'].should be_nil
+          @results['disabled_checkbox'].should be_nil
+          @results['disabled_radio'].should be_nil
+          @results['disabled_select'].should be_nil
+          @results['disabled_file'].should be_nil
+        end
       end
     end
 

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

@@ -0,0 +1,37 @@
+shared_examples_for "click_link_or_button" do
+  describe '#click' do
+    it "should click on a link" do
+      @session.visit('/with_html')
+      @session.click_link_or_button('labore')
+      @session.body.should include('Bar')
+    end
+
+    it "should click on a button" do
+      @session.visit('/form')
+      @session.click_link_or_button('awe123')
+      extract_results(@session)['first_name'].should == 'John'
+    end
+
+    it "should click on a button with no type attribute" do
+      @session.visit('/form')
+      @session.click_link_or_button('no_type')
+      extract_results(@session)['first_name'].should == 'John'
+    end
+
+    it "should be aliased as click for backward compatibility" do
+      Capybara.should_receive(:deprecate).with("click", "click_link_or_button")
+      @session.visit('/form')
+      @session.click('awe123')
+      extract_results(@session)['first_name'].should == 'John'
+    end
+
+    context "with a locator that doesn't exist" do
+      it "should raise an error" do
+        @session.visit('/with_html')
+        running do
+          @session.click_link_or_button('does not exist')
+        end.should raise_error(Capybara::ElementNotFound)
+      end
+    end
+  end
+end