capybara 2.2.1 → 2.3.0

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

@@ -2,39 +2,39 @@ Capybara::SpecHelper.spec '#reset_session!' do
   it "removes cookies" do
     @session.visit('/set_cookie')
     @session.visit('/get_cookie')
-    @session.should have_content('test_cookie')
+    expect(@session).to have_content('test_cookie')
 
     @session.reset_session!
     @session.visit('/get_cookie')
-    @session.body.should_not include('test_cookie')
+    expect(@session.body).not_to include('test_cookie')
   end
 
   it "resets current url, host, path" do
     @session.visit '/foo'
-    @session.current_url.should_not be_empty
-    @session.current_host.should_not be_empty
-    @session.current_path.should == '/foo'
+    expect(@session.current_url).not_to be_empty
+    expect(@session.current_host).not_to be_empty
+    expect(@session.current_path).to eq('/foo')
 
     @session.reset_session!
-    [nil, '', 'about:blank'].should include(@session.current_url)
-    ['', nil].should include(@session.current_path)
-    @session.current_host.should be_nil
+    expect([nil, '', 'about:blank']).to include(@session.current_url)
+    expect(['', nil]).to include(@session.current_path)
+    expect(@session.current_host).to be_nil
   end
 
   it "resets page body" do
     @session.visit('/with_html')
-    @session.should have_content('This is a test')
-    @session.find('.//h1').text.should include('This is a test')
+    expect(@session).to have_content('This is a test')
+    expect(@session.find('.//h1').text).to include('This is a test')
 
     @session.reset_session!
-    @session.body.should_not include('This is a test')
-    @session.should have_no_selector('.//h1')
+    expect(@session.body).not_to include('This is a test')
+    expect(@session).to have_no_selector('.//h1')
   end
 
   it "is synchronous" do
     @session.visit("/with_html")
     @session.reset_session!
-    @session.should have_no_selector :xpath, "/html/body/*", wait: false
+    expect(@session).to have_no_selector :xpath, "/html/body/*", wait: false
   end
 
   it "raises any errors caught inside the server", :requires => [:server] do
@@ -43,7 +43,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
       @session.reset_session!
     end.to raise_error(TestApp::TestAppError)
     @session.visit("/")
-    @session.current_path.should == "/"
+    expect(@session.current_path).to eq("/")
   end
 
   it "ignores server errors when `Capybara.raise_server_errors = false`", :requires => [:server] do
@@ -51,6 +51,6 @@ Capybara::SpecHelper.spec '#reset_session!' do
     quietly { @session.visit("/error") }
     @session.reset_session!
     @session.visit("/")
-    @session.current_path.should == "/"
+    expect(@session.current_path).to eq("/")
   end
 end

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

@@ -1,6 +1,6 @@
 Capybara::SpecHelper.spec '#status_code' do
   it "should return response codes", :requires => [:status_code] do
     @session.visit('/with_simple_html')
-    @session.status_code.should == 200
+    expect(@session.status_code).to eq(200)
   end
 end

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

@@ -0,0 +1,46 @@
+require 'launchy'
+
+Capybara::SpecHelper.spec '#save_and_open_screenshot' do
+  before do
+    @session.visit '/'
+  end
+
+  it 'opens file from the default directory', :requires => [:screenshot] do
+    expected_file_regex = %r{capybara/capybara-\d+\.png}
+    allow(@session.driver).to receive(:save_screenshot)
+    allow(Launchy).to receive(:open)
+
+    @session.save_and_open_screenshot
+
+    expect(@session.driver).to have_received(:save_screenshot).
+      with(expected_file_regex, {})
+    expect(Launchy).to have_received(:open).with(expected_file_regex)
+  end
+
+  it 'opens file from the provided directory', :requires => [:screenshot] do
+    custom_path = 'screenshots/1.png'
+    allow(@session.driver).to receive(:save_screenshot)
+    allow(Launchy).to receive(:open)
+
+    @session.save_and_open_screenshot(custom_path)
+
+    expect(@session.driver).to have_received(:save_screenshot).
+      with(custom_path, {})
+    expect(Launchy).to have_received(:open).with(custom_path)
+  end
+
+  context 'when launchy cannot be required' do
+    it 'prints out a correct warning message', :requires => [:screenshot] do
+      file_path = File.join(Dir.tmpdir, 'test.png')
+      allow(@session).to receive(:require).with('launchy').and_raise(LoadError)
+      allow(@session).to receive(:warn)
+
+      @session.save_and_open_screenshot(file_path)
+
+      expect(@session).to have_received(:warn).
+        with("File saved to #{file_path}.")
+      expect(@session).to have_received(:warn).
+        with('Please install the launchy gem to open the file automatically.')
+    end
+  end
+end

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

@@ -15,39 +15,39 @@ Capybara::SpecHelper.spec '#save_page' do
   it "saves the page in the root directory" do
     @session.save_page
     path = Dir.glob("capybara-*.html").first
-    File.read(path).should include("Another World")
+    expect(File.read(path)).to include("Another World")
   end
 
   it "generates a sensible filename" do
     @session.save_page
     path = Dir.glob("capybara-*.html").first
     filename = path.split("/").last
-    filename.should =~ /^capybara-\d+\.html$/
+    expect(filename).to match /^capybara-\d+\.html$/
   end
 
   it "can store files in a specified directory" do
     Capybara.save_and_open_page_path = alternative_path
     @session.save_page
     path = Dir.glob(alternative_path + "/capybara-*.html").first
-    File.read(path).should include("Another World")
+    expect(File.read(path)).to include("Another World")
   end
 
   it "uses the given filename" do
     @session.save_page("capybara-001122.html")
-    File.read("capybara-001122.html").should include("Another World")
+    expect(File.read("capybara-001122.html")).to include("Another World")
   end
 
   it "returns an absolute path in pwd" do
     result = @session.save_page
     path = File.expand_path(Dir.glob("capybara-*.html").first, Dir.pwd)
-    result.should == path
+    expect(result).to eq(path)
   end
 
   it "returns an absolute path in given directory" do
     Capybara.save_and_open_page_path = alternative_path
     result = @session.save_page
     path = File.expand_path(Dir.glob(alternative_path + "/capybara-*.html").first, alternative_path)
-    result.should == path
+    expect(result).to eq(path)
   end
 
   context "asset_host contains a string" do
@@ -59,7 +59,7 @@ Capybara::SpecHelper.spec '#save_page' do
       path = @session.save_page
 
       result = File.read(path)
-      result.should include("<head><base href='http://example.com' />")
+      expect(result).to include("<head><base href='http://example.com' />")
     end
 
     it "doesn't prepend base tag to pages when asset_host is nil" do
@@ -68,7 +68,7 @@ Capybara::SpecHelper.spec '#save_page' do
       path = @session.save_page
 
       result = File.read(path)
-      result.should_not include("http://example.com")
+      expect(result).not_to include("http://example.com")
     end
 
     it "doesn't prepend base tag to pages which already have it" do
@@ -76,7 +76,7 @@ Capybara::SpecHelper.spec '#save_page' do
       path = @session.save_page
 
       result = File.read(path)
-      result.should_not include("http://example.com")
+      expect(result).not_to include("http://example.com")
     end
   end
 end

data/lib/capybara/spec/session/{screenshot.rb → screenshot_spec.rb}

@@ -4,11 +4,13 @@ Capybara::SpecHelper.spec "#save_screenshot" do
 
   before do
     @session.visit '/'
-    @session.save_screenshot image_path
   end
 
   it "should generate PNG file", :requires => [:screenshot] do
+    path = @session.save_screenshot image_path
+
     magic = File.read(image_path, 4)
-    magic.should eq "\x89PNG"
+    expect(magic).to eq "\x89PNG"
+    expect(path).to eq image_path
   end
 end

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

@@ -4,22 +4,22 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "should return value of the first option" do
-    @session.find_field('Title').value.should == 'Mrs'
+    expect(@session.find_field('Title').value).to eq('Mrs')
   end
 
   it "should return value of the selected option" do
     @session.select("Miss", :from => 'Title')
-    @session.find_field('Title').value.should == 'Miss'
+    expect(@session.find_field('Title').value).to eq('Miss')
   end
 
   it "should allow selecting options where there are inexact matches" do
     @session.select("Mr", :from => 'Title')
-    @session.find_field('Title').value.should == 'Mr'
+    expect(@session.find_field('Title').value).to eq('Mr')
   end
 
   it "should allow selecting options where they are the only inexact match" do
     @session.select("Mis", :from => 'Title')
-    @session.find_field('Title').value.should == 'Miss'
+    expect(@session.find_field('Title').value).to eq('Miss')
   end
 
   it "should not allow selecting options where they are the only inexact match if `Capybara.exact_options = true`" do
@@ -36,50 +36,50 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "should return the value attribute rather than content if present" do
-    @session.find_field('Locale').value.should == 'en'
+    expect(@session.find_field('Locale').value).to eq('en')
   end
 
   it "should select an option from a select box by id" do
     @session.select("Finish", :from => 'form_locale')
     @session.click_button('awesome')
-    extract_results(@session)['locale'].should == 'fi'
+    expect(extract_results(@session)['locale']).to eq('fi')
   end
 
   it "should select an option from a select box by label" do
     @session.select("Finish", :from => 'Locale')
     @session.click_button('awesome')
-    extract_results(@session)['locale'].should == 'fi'
+    expect(extract_results(@session)['locale']).to eq('fi')
   end
 
   it "should select an option without giving a select box" do
     @session.select("Swedish")
     @session.click_button('awesome')
-    extract_results(@session)['locale'].should == 'sv'
+    expect(extract_results(@session)['locale']).to eq('sv')
   end
 
   it "should escape quotes" do
     @session.select("John's made-up language", :from => 'Locale')
     @session.click_button('awesome')
-    extract_results(@session)['locale'].should == 'jo'
+    expect(extract_results(@session)['locale']).to eq('jo')
   end
 
   it "should obey from" do
     @session.select("Miss", :from => "Other title")
     @session.click_button('awesome')
     results = extract_results(@session)
-    results['other_title'].should == "Miss"
-    results['title'].should_not == "Miss"
+    expect(results['other_title']).to eq("Miss")
+    expect(results['title']).not_to eq("Miss")
   end
 
   it "show match labels with preceding or trailing whitespace" do
     @session.select("Lojban", :from => 'Locale')
     @session.click_button('awesome')
-    extract_results(@session)['locale'].should == 'jbo'
+    expect(extract_results(@session)['locale']).to eq('jbo')
   end
 
   it "casts to string" do
     @session.select(:"Miss", :from => :'Title')
-    @session.find_field('Title').value.should == 'Miss'
+    expect(@session.find_field('Title').value).to eq('Miss')
   end
 
   context "with a locator that doesn't exist" do
@@ -110,26 +110,26 @@ Capybara::SpecHelper.spec "#select" do
 
   context "with multiple select" do
     it "should return an empty value" do
-      @session.find_field('Language').value.should == []
+      expect(@session.find_field('Language').value).to eq([])
     end
 
     it "should return value of the selected options" do
       @session.select("Ruby",       :from => 'Language')
       @session.select("Javascript", :from => 'Language')
-      @session.find_field('Language').value.should include('Ruby', 'Javascript')
+      expect(@session.find_field('Language').value).to include('Ruby', 'Javascript')
     end
 
     it "should select one option" do
       @session.select("Ruby", :from => 'Language')
       @session.click_button('awesome')
-      extract_results(@session)['languages'].should == ['Ruby']
+      expect(extract_results(@session)['languages']).to eq(['Ruby'])
     end
 
     it "should select multiple options" do
       @session.select("Ruby",       :from => 'Language')
       @session.select("Javascript", :from => 'Language')
       @session.click_button('awesome')
-      extract_results(@session)['languages'].should include('Ruby', 'Javascript')
+      expect(extract_results(@session)['languages']).to include('Ruby', 'Javascript')
     end
 
     it "should remain selected if already selected" do
@@ -137,11 +137,11 @@ Capybara::SpecHelper.spec "#select" do
       @session.select("Javascript", :from => 'Language')
       @session.select("Ruby",       :from => 'Language')
       @session.click_button('awesome')
-      extract_results(@session)['languages'].should include('Ruby', 'Javascript')
+      expect(extract_results(@session)['languages']).to include('Ruby', 'Javascript')
     end
 
     it "should return value attribute rather than content if present" do
-      @session.find_field('Underwear').value.should include('thermal')
+      expect(@session.find_field('Underwear').value).to include('thermal')
     end
   end
 
@@ -150,19 +150,19 @@ Capybara::SpecHelper.spec "#select" do
       it "can match select box approximately" do
         @session.select("Finish", :from => "Loc", :exact => false)
         @session.click_button("awesome")
-        extract_results(@session)["locale"].should == "fi"
+        expect(extract_results(@session)["locale"]).to eq("fi")
       end
 
       it "can match option approximately" do
         @session.select("Fin", :from => "Locale", :exact => false)
         @session.click_button("awesome")
-        extract_results(@session)["locale"].should == "fi"
+        expect(extract_results(@session)["locale"]).to eq("fi")
       end
 
       it "can match option approximately when :from not given" do
         @session.select("made-up language", :exact => false)
         @session.click_button("awesome")
-        extract_results(@session)["locale"].should == "jo"
+        expect(extract_results(@session)["locale"]).to eq("jo")
       end
     end
 

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

@@ -1,45 +1,50 @@
 Capybara::SpecHelper.spec '#text' do
   it "should print the text of the page" do
     @session.visit('/with_simple_html')
-    @session.text.should == 'Bar'
+    expect(@session.text).to eq('Bar')
   end
 
   it "ignores invisible text by default" do
     @session.visit('/with_html')
-    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
   end
 
   it "shows invisible text if `:all` given" do
     @session.visit('/with_html')
-    @session.find(:id, "hidden-text").text(:all).should == 'Some of this text is hidden!'
+    expect(@session.find(:id, "hidden-text").text(:all)).to eq('Some of this text is hidden!')
   end
 
   it "ignores invisible text if `:visible` given" do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
-    @session.find(:id, "hidden-text").text(:visible).should == 'Some of this text is'
+    expect(@session.find(:id, "hidden-text").text(:visible)).to eq('Some of this text is')
   end
 
   it "ignores invisible text if `Capybara.ignore_hidden_elements = true`" do
     @session.visit('/with_html')
-    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
     Capybara.ignore_hidden_elements = false
-    @session.find(:id, "hidden-text").text.should == 'Some of this text is hidden!'
+    expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is hidden!')
   end
 
   it "ignores invisible text if `Capybara.visible_text_only = true`" do
     @session.visit('/with_html')
     Capybara.visible_text_only = true
-    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
     Capybara.ignore_hidden_elements = false
-    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
+  end
+  
+  it "ignores invisible text if ancestor is invisible" do
+    @session.visit('/with_html')
+    expect(@session.find(:id, "hidden_via_ancestor", visible: false).text).to eq('')
   end
 
   context "with css as default selector" do
     before { Capybara.default_selector = :css }
     it "should print the text of the page" do
       @session.visit('/with_simple_html')
-      @session.text.should == 'Bar'
+      expect(@session.text).to eq('Bar')
     end
     after { Capybara.default_selector = :xpath }
   end
@@ -47,7 +52,7 @@ Capybara::SpecHelper.spec '#text' do
   it "should strip whitespace" do
     @session.visit('/with_html')
     n = @session.find(:css, '#second')
-    @session.find(:css, '#second').text.should =~ \
+    expect(@session.find(:css, '#second').text).to match \
       /\ADuis aute .* text with whitespace .* est laborum\.\z/
   end
 end

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

@@ -2,14 +2,14 @@ Capybara::SpecHelper.spec '#title' do
 
   it "should print the title of the page" do
     @session.visit('/with_title')
-    @session.title.should == 'Test Title'
+    expect(@session.title).to eq('Test Title')
   end
 
   context "with css as default selector" do
     before { Capybara.default_selector = :css }
     it "should print the title of the page" do
       @session.visit('/with_title')
-      @session.title.should == 'Test Title'
+      expect(@session.title).to eq('Test Title')
     end
     after { Capybara.default_selector = :xpath }
   end