capybara 2.0.0.beta2 → 2.0.0.beta4

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

@@ -1,129 +1,123 @@
-shared_examples_for "has_selector" do
-  describe '#has_selector?' do
-    before do
-      @session.visit('/with_html')
+Capybara::SpecHelper.spec '#has_selector?' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it "should be true if the given selector is on the page" do
+    @session.should have_selector(:xpath, "//p")
+    @session.should have_selector(:css, "p a#foo")
+    @session.should have_selector("//p[contains(.,'est')]")
+  end
+
+  it "should be false if the given selector is not on the page" do
+    @session.should_not have_selector(:xpath, "//abbr")
+    @session.should_not have_selector(:css, "p a#doesnotexist")
+    @session.should_not have_selector("//p[contains(.,'thisstringisnotonpage')]")
+  end
+
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    @session.should_not have_selector("p a#doesnotexist")
+    @session.should have_selector("p a#foo")
+  end
+
+  it "should respect scopes" do
+    @session.within "//p[@id='first']" do
+      @session.should have_selector(".//a[@id='foo']")
+      @session.should_not have_selector(".//a[@id='red']")
     end
+  end
 
-    it "should be true if the given selector is on the page" do
-      @session.should have_selector(:xpath, "//p")
-      @session.should have_selector(:css, "p a#foo")
-      @session.should have_selector(:foo)
-      @session.should have_selector("//p[contains(.,'est')]")
+  context "with count" do
+    it "should be true if the content is on the page the given number of times" do
+      @session.should have_selector("//p", :count => 3)
+      @session.should have_selector("//p//a[@id='foo']", :count => 1)
+      @session.should have_selector("//p[contains(.,'est')]", :count => 1)
     end
 
-    it "should be false if the given selector is not on the page" do
-      @session.should_not have_selector(:xpath, "//abbr")
-      @session.should_not have_selector(:css, "p a#doesnotexist")
-      @session.should_not have_selector(:doesnotexist)
-      @session.should_not have_selector("//p[contains(.,'thisstringisnotonpage')]")
+    it "should be false if the content is on the page the given number of times" do
+      @session.should_not have_selector("//p", :count => 6)
+      @session.should_not have_selector("//p//a[@id='foo']", :count => 2)
+      @session.should_not have_selector("//p[contains(.,'est')]", :count => 5)
     end
 
-    it "should use default selector" do
-      Capybara.default_selector = :css
-      @session.should_not have_selector("p a#doesnotexist")
-      @session.should have_selector("p a#foo")
+    it "should be false if the content isn't on the page at all" do
+      @session.should_not have_selector("//abbr", :count => 2)
+      @session.should_not have_selector("//p//a[@id='doesnotexist']", :count => 1)
     end
+  end
 
-    it "should respect scopes" do
-      @session.within "//p[@id='first']" do
-        @session.should have_selector(".//a[@id='foo']")
-        @session.should_not have_selector(".//a[@id='red']")
-      end
+  context "with text" do
+    it "should discard all matches where the given string is not contained" do
+      @session.should have_selector("//p//a", :text => "Redirect", :count => 1)
+      @session.should_not have_selector("//p", :text => "Doesnotexist")
     end
 
-    context "with count" do
-      it "should be true if the content is on the page the given number of times" do
-        @session.should have_selector("//p", :count => 3)
-        @session.should have_selector("//p//a[@id='foo']", :count => 1)
-        @session.should have_selector("//p[contains(.,'est')]", :count => 1)
-      end
-
-      it "should be false if the content is on the page the given number of times" do
-        @session.should_not have_selector("//p", :count => 6)
-        @session.should_not have_selector("//p//a[@id='foo']", :count => 2)
-        @session.should_not have_selector("//p[contains(.,'est')]", :count => 5)
-      end
-
-      it "should be false if the content isn't on the page at all" do
-        @session.should_not have_selector("//abbr", :count => 2)
-        @session.should_not have_selector("//p//a[@id='doesnotexist']", :count => 1)
-      end
+    it "should discard all matches where the given regexp is not matched" do
+      @session.should have_selector("//p//a", :text => /re[dab]i/i, :count => 1)
+      @session.should_not have_selector("//p//a", :text => /Red$/)
     end
+  end
+end
 
-    context "with text" do
-      it "should discard all matches where the given string is not contained" do
-        @session.should have_selector("//p//a", :text => "Redirect", :count => 1)
-        @session.should_not have_selector("//p", :text => "Doesnotexist")
-      end
+Capybara::SpecHelper.spec '#has_no_selector?' do
+  before do
+    @session.visit('/with_html')
+  end
 
-      it "should discard all matches where the given regexp is not matched" do
-        @session.should have_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-        @session.should_not have_selector("//p//a", :text => /Red$/)
-      end
-    end
+  it "should be false if the given selector is on the page" do
+    @session.should_not have_no_selector(:xpath, "//p")
+    @session.should_not have_no_selector(:css, "p a#foo")
+    @session.should_not have_no_selector("//p[contains(.,'est')]")
   end
 
-  describe '#has_no_selector?' do
-    before do
-      @session.visit('/with_html')
-    end
+  it "should be true if the given selector is not on the page" do
+    @session.should have_no_selector(:xpath, "//abbr")
+    @session.should have_no_selector(:css, "p a#doesnotexist")
+    @session.should have_no_selector("//p[contains(.,'thisstringisnotonpage')]")
+  end
 
-    it "should be false if the given selector is on the page" do
-      @session.should_not have_no_selector(:xpath, "//p")
-      @session.should_not have_no_selector(:css, "p a#foo")
-      @session.should_not have_no_selector(:foo)
-      @session.should_not have_no_selector("//p[contains(.,'est')]")
-    end
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    @session.should have_no_selector("p a#doesnotexist")
+    @session.should_not have_no_selector("p a#foo")
+  end
 
-    it "should be true if the given selector is not on the page" do
-      @session.should have_no_selector(:xpath, "//abbr")
-      @session.should have_no_selector(:css, "p a#doesnotexist")
-      @session.should have_no_selector(:doesnotexist)
-      @session.should have_no_selector("//p[contains(.,'thisstringisnotonpage')]")
+  it "should respect scopes" do
+    @session.within "//p[@id='first']" do
+      @session.should_not have_no_selector(".//a[@id='foo']")
+      @session.should have_no_selector(".//a[@id='red']")
     end
+  end
 
-    it "should use default selector" do
-      Capybara.default_selector = :css
-      @session.should have_no_selector("p a#doesnotexist")
-      @session.should_not have_no_selector("p a#foo")
+  context "with count" do
+    it "should be false if the content is on the page the given number of times" do
+      @session.should_not have_no_selector("//p", :count => 3)
+      @session.should_not have_no_selector("//p//a[@id='foo']", :count => 1)
+      @session.should_not have_no_selector("//p[contains(.,'est')]", :count => 1)
     end
 
-    it "should respect scopes" do
-      @session.within "//p[@id='first']" do
-        @session.should_not have_no_selector(".//a[@id='foo']")
-        @session.should have_no_selector(".//a[@id='red']")
-      end
+    it "should be true if the content is on the page the wrong number of times" do
+      @session.should have_no_selector("//p", :count => 6)
+      @session.should have_no_selector("//p//a[@id='foo']", :count => 2)
+      @session.should have_no_selector("//p[contains(.,'est')]", :count => 5)
     end
 
-    context "with count" do
-      it "should be false if the content is on the page the given number of times" do
-        @session.should_not have_no_selector("//p", :count => 3)
-        @session.should_not have_no_selector("//p//a[@id='foo']", :count => 1)
-        @session.should_not have_no_selector("//p[contains(.,'est')]", :count => 1)
-      end
-
-      it "should be true if the content is on the page the wrong number of times" do
-        @session.should have_no_selector("//p", :count => 6)
-        @session.should have_no_selector("//p//a[@id='foo']", :count => 2)
-        @session.should have_no_selector("//p[contains(.,'est')]", :count => 5)
-      end
-
-      it "should be true if the content isn't on the page at all" do
-        @session.should have_no_selector("//abbr", :count => 2)
-        @session.should have_no_selector("//p//a[@id='doesnotexist']", :count => 1)
-      end
+    it "should be true if the content isn't on the page at all" do
+      @session.should have_no_selector("//abbr", :count => 2)
+      @session.should have_no_selector("//p//a[@id='doesnotexist']", :count => 1)
     end
+  end
 
-    context "with text" do
-      it "should discard all matches where the given string is contained" do
-        @session.should_not have_no_selector("//p//a", :text => "Redirect", :count => 1)
-        @session.should have_no_selector("//p", :text => "Doesnotexist")
-      end
+  context "with text" do
+    it "should discard all matches where the given string is contained" do
+      @session.should_not have_no_selector("//p//a", :text => "Redirect", :count => 1)
+      @session.should have_no_selector("//p", :text => "Doesnotexist")
+    end
 
-      it "should discard all matches where the given regexp is matched" do
-        @session.should_not have_no_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-        @session.should have_no_selector("//p//a", :text => /Red$/)
-      end
+    it "should discard all matches where the given regexp is matched" do
+      @session.should_not have_no_selector("//p//a", :text => /re[dab]i/i, :count => 1)
+      @session.should have_no_selector("//p//a", :text => /Red$/)
     end
   end
 end

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

@@ -1,34 +1,30 @@
-shared_examples_for "has_table" do
-  describe '#has_table?' do
-    before do
-      @session.visit('/tables')
-    end
-
-    it "should be true if the table is on the page" do
-      @session.should have_table('Villain')
-      @session.should have_table('villain_table')
-    end
-
-    it "should be false if the table is not on the page" do
-      @session.should_not have_table('Monkey')
-    end
+Capybara::SpecHelper.spec '#has_table?' do
+  before do
+    @session.visit('/tables')
   end
 
-  describe '#has_no_table?' do
-    before do
-      @session.visit('/tables')
-    end
-
-    it "should be false if the table is on the page" do
-      @session.should_not have_no_table('Villain')
-      @session.should_not have_no_table('villain_table')
-    end
+  it "should be true if the table is on the page" do
+    @session.should have_table('Villain')
+    @session.should have_table('villain_table')
+    @session.should have_table(:'villain_table')
+  end
 
-    it "should be true if the table is not on the page" do
-      @session.should have_no_table('Monkey')
-    end
+  it "should be false if the table is not on the page" do
+    @session.should_not have_table('Monkey')
   end
 end
 
+Capybara::SpecHelper.spec '#has_no_table?' do
+  before do
+    @session.visit('/tables')
+  end
 
+  it "should be false if the table is on the page" do
+    @session.should_not have_no_table('Villain')
+    @session.should_not have_no_table('villain_table')
+  end
 
+  it "should be true if the table is not on the page" do
+    @session.should have_no_table('Monkey')
+  end
+end

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

@@ -1,168 +1,195 @@
-shared_examples_for 'has_text' do
-  describe '#has_text?' do
-    it "should be true if the given text is on the page at least once" do
-      @session.visit('/with_html')
-      @session.should have_text('est')
-      @session.should have_text('Lorem')
-      @session.should have_text('Redirect')
-    end
+Capybara::SpecHelper.spec '#has_text?' do
+  it "should be true if the given text is on the page at least once" do
+    @session.visit('/with_html')
+    @session.should have_text('est')
+    @session.should have_text('Lorem')
+    @session.should have_text('Redirect')
+    @session.should have_text(:'Redirect')
+  end
 
-    it "should be true if scoped to an element which has the text" do
-      @session.visit('/with_html')
-      @session.within("//a[@title='awesome title']") do
-        @session.should have_text('labore')
-      end
+  it "should be true if scoped to an element which has the text" do
+    @session.visit('/with_html')
+    @session.within("//a[@title='awesome title']") do
+      @session.should have_text('labore')
     end
+  end
 
-    it "should be false if scoped to an element which does not have the text" do
-      @session.visit('/with_html')
-      @session.within("//a[@title='awesome title']") do
-        @session.should_not have_text('monkey')
-      end
+  it "should be false if scoped to an element which does not have the text" do
+    @session.visit('/with_html')
+    @session.within("//a[@title='awesome title']") do
+      @session.should_not have_text('monkey')
     end
+  end
 
-    it "should ignore tags" do
-      @session.visit('/with_html')
-      @session.should_not have_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
-      @session.should have_text('exercitation ullamco laboris')
-    end
+  it "should ignore tags" do
+    @session.visit('/with_html')
+    @session.should_not have_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
+    @session.should have_text('exercitation ullamco laboris')
+  end
 
-    it "should ignore extra whitespace and newlines" do
-      @session.visit('/with_html')
-      @session.should have_text('text with whitespace')
-    end
+  it "should ignore extra whitespace and newlines" do
+    @session.visit('/with_html')
+    @session.should have_text('text with whitespace')
+  end
 
-    it "should be false if the given text is not on the page" do
-      @session.visit('/with_html')
-      @session.should_not have_text('xxxxyzzz')
-      @session.should_not have_text('monkey')
-    end
+  it "should ignore whitespace and newlines in the search string" do
+    @session.visit('/with_html')
+    @session.should have_text("text     with \n\n whitespace")
+  end
 
-    it 'should handle single quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should have_text("can't")
-    end
+  it "should be false if the given text is not on the page" do
+    @session.visit('/with_html')
+    @session.should_not have_text('xxxxyzzz')
+    @session.should_not have_text('monkey')
+  end
 
-    it 'should handle double quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should have_text(%q{"No," he said})
-    end
+  it 'should handle single quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should have_text("can't")
+  end
 
-    it 'should handle mixed single and double quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should have_text(%q{"you can't do that."})
-    end
+  it 'should handle double quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should have_text(%q{"No," he said})
+  end
 
-    it 'should be false if text is in the title tag in the head' do
-      @session.visit('/with_js')
-      @session.should_not have_text('with_js')
-    end
+  it 'should handle mixed single and double quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should have_text(%q{"you can't do that."})
+  end
 
-    it 'should be false if text is inside a script tag in the body' do
-      @session.visit('/with_js')
-      @session.should_not have_text('a javascript comment')
-      @session.should_not have_text('aVar')
-    end
+  it 'should be false if text is in the title tag in the head' do
+    @session.visit('/with_js')
+    @session.should_not have_text('with_js')
+  end
 
-    it "should be false if the given text is on the page but not visible" do
-      @session.visit('/with_html')
-      @session.should_not have_text('Inside element with hidden ancestor')
-    end
+  it 'should be false if text is inside a script tag in the body' do
+    @session.visit('/with_js')
+    @session.should_not have_text('a javascript comment')
+    @session.should_not have_text('aVar')
+  end
 
-    it "should be true if the text in the page matches given regexp" do
-      @session.visit('/with_html')
-      @session.should have_text(/Lorem/)
-    end
+  it "should be false if the given text is on the page but not visible" do
+    @session.visit('/with_html')
+    @session.should_not have_text('Inside element with hidden ancestor')
+  end
 
-    it "should be false if the text in the page doesn't match given regexp" do
-      @session.visit('/with_html')
-      @session.should_not have_text(/xxxxyzzz/)
-    end
+  it "should be true if the text in the page matches given regexp" do
+    @session.visit('/with_html')
+    @session.should have_text(/Lorem/)
+  end
 
-    it "should escape any characters that would have special meaning in a regexp" do
-      @session.visit('/with_html')
-      @session.should_not have_text('.orem')
-    end
+  it "should be false if the text in the page doesn't match given regexp" do
+    @session.visit('/with_html')
+    @session.should_not have_text(/xxxxyzzz/)
   end
 
-  describe '#has_no_text?' do
-    it "should be false if the given text is on the page at least once" do
-      @session.visit('/with_html')
-      @session.should_not have_no_text('est')
-      @session.should_not have_no_text('Lorem')
-      @session.should_not have_no_text('Redirect')
-    end
+  it "should escape any characters that would have special meaning in a regexp" do
+    @session.visit('/with_html')
+    @session.should_not have_text('.orem')
+  end
 
-    it "should be false if scoped to an element which has the text" do
-      @session.visit('/with_html')
-      @session.within("//a[@title='awesome title']") do
-        @session.should_not have_no_text('labore')
-      end
-    end
+  it "should accept non-string parameters" do
+    @session.visit('/with_html')
+    @session.should have_text(42)
+  end
 
-    it "should be true if scoped to an element which does not have the text" do
-      @session.visit('/with_html')
-      @session.within("//a[@title='awesome title']") do
-        @session.should have_no_text('monkey')
-      end
-    end
+  it "should be true when passed nil" do
+    # Historical behavior; no particular reason other than compatibility.
+    @session.visit('/with_html')
+    @session.should have_text(nil)
+  end
+
+  it "should wait for text to appear", :requires => [:js] do
+    @session.visit('/with_js')
+    @session.click_link('Click me')
+    @session.should have_text("Has been clicked")
+  end
+end
+
+Capybara::SpecHelper.spec '#has_no_text?' do
+  it "should be false if the given text is on the page at least once" do
+    @session.visit('/with_html')
+    @session.should_not have_no_text('est')
+    @session.should_not have_no_text('Lorem')
+    @session.should_not have_no_text('Redirect')
+  end
 
-    it "should ignore tags" do
-      @session.visit('/with_html')
-      @session.should have_no_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
-      @session.should_not have_no_text('exercitation ullamco laboris')
+  it "should be false if scoped to an element which has the text" do
+    @session.visit('/with_html')
+    @session.within("//a[@title='awesome title']") do
+      @session.should_not have_no_text('labore')
     end
+  end
 
-    it "should be true if the given text is not on the page" do
-      @session.visit('/with_html')
-      @session.should have_no_text('xxxxyzzz')
+  it "should be true if scoped to an element which does not have the text" do
+    @session.visit('/with_html')
+    @session.within("//a[@title='awesome title']") do
       @session.should have_no_text('monkey')
     end
+  end
 
-    it 'should handle single quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should_not have_no_text("can't")
-    end
+  it "should ignore tags" do
+    @session.visit('/with_html')
+    @session.should have_no_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
+    @session.should_not have_no_text('exercitation ullamco laboris')
+  end
 
-    it 'should handle double quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should_not have_no_text(%q{"No," he said})
-    end
+  it "should be true if the given text is not on the page" do
+    @session.visit('/with_html')
+    @session.should have_no_text('xxxxyzzz')
+    @session.should have_no_text('monkey')
+  end
 
-    it 'should handle mixed single and double quotes in the text' do
-      @session.visit('/with-quotes')
-      @session.should_not have_no_text(%q{"you can't do that."})
-    end
+  it 'should handle single quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should_not have_no_text("can't")
+  end
 
-    it 'should be true if text is in the title tag in the head' do
-      @session.visit('/with_js')
-      @session.should have_no_text('with_js')
-    end
+  it 'should handle double quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should_not have_no_text(%q{"No," he said})
+  end
 
-    it 'should be true if text is inside a script tag in the body' do
-      @session.visit('/with_js')
-      @session.should have_no_text('a javascript comment')
-      @session.should have_no_text('aVar')
-    end
+  it 'should handle mixed single and double quotes in the text' do
+    @session.visit('/with-quotes')
+    @session.should_not have_no_text(%q{"you can't do that."})
+  end
 
-    it "should be true if the given text is on the page but not visible" do
-      @session.visit('/with_html')
-      @session.should have_no_text('Inside element with hidden ancestor')
-    end
+  it 'should be true if text is in the title tag in the head' do
+    @session.visit('/with_js')
+    @session.should have_no_text('with_js')
+  end
 
-    it "should be true if the text in the page doesn't match given regexp" do
-      @session.visit('/with_html')
-      @session.should have_no_text(/xxxxyzzz/)
-    end
+  it 'should be true if text is inside a script tag in the body' do
+    @session.visit('/with_js')
+    @session.should have_no_text('a javascript comment')
+    @session.should have_no_text('aVar')
+  end
 
-    it "should be false if the text in the page  matches given regexp" do
-      @session.visit('/with_html')
-      @session.should_not have_no_text(/Lorem/)
-    end
+  it "should be true if the given text is on the page but not visible" do
+    @session.visit('/with_html')
+    @session.should have_no_text('Inside element with hidden ancestor')
+  end
 
-    it "should escape any characters that would have special meaning in a regexp" do
-      @session.visit('/with_html')
-      @session.should have_no_text('.orem')
-    end
+  it "should be true if the text in the page doesn't match given regexp" do
+    @session.visit('/with_html')
+    @session.should have_no_text(/xxxxyzzz/)
+  end
+
+  it "should be false if the text in the page  matches given regexp" do
+    @session.visit('/with_html')
+    @session.should_not have_no_text(/Lorem/)
+  end
+
+  it "should escape any characters that would have special meaning in a regexp" do
+    @session.visit('/with_html')
+    @session.should have_no_text('.orem')
+  end
+
+  it "should wait for text to disappear", :requires => [:js] do
+    @session.visit('/with_js')
+    @session.click_link('Click me')
+    @session.should have_no_text("I changed it")
   end
 end