diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..7fcbd856 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +lib/capybara/spec/views/*.erb eol=lf \ No newline at end of file diff --git a/lib/capybara/spec/session/attach_file_spec.rb b/lib/capybara/spec/session/attach_file_spec.rb index df821cc1..88a6a080 100644 --- a/lib/capybara/spec/session/attach_file_spec.rb +++ b/lib/capybara/spec/session/attach_file_spec.rb @@ -11,19 +11,19 @@ Capybara::SpecHelper.spec "#attach_file" do context "with normal form" do it "should set a file path by id" do - @session.attach_file "form_image", __FILE__ + @session.attach_file "form_image", attachment_path(__FILE__) @session.click_button('awesome') expect(extract_results(@session)['image']).to eq(File.basename(__FILE__)) end it "should set a file path by label" do - @session.attach_file "Image", __FILE__ + @session.attach_file "Image", attachment_path(__FILE__) @session.click_button('awesome') expect(extract_results(@session)['image']).to eq(File.basename(__FILE__)) end it "casts to string" do - @session.attach_file :form_image, __FILE__ + @session.attach_file :form_image, attachment_path(__FILE__) @session.click_button('awesome') expect(extract_results(@session)['image']).to eq(File.basename(__FILE__)) end @@ -31,13 +31,13 @@ Capybara::SpecHelper.spec "#attach_file" do context "with multipart form" do it "should set a file path by id" do - @session.attach_file "form_document", @test_file_path + @session.attach_file "form_document", attachment_path(@test_file_path) @session.click_button('Upload Single') expect(@session).to have_content(File.read(@test_file_path)) end it "should set a file path by label" do - @session.attach_file "Single Document", @test_file_path + @session.attach_file "Single Document", attachment_path(@test_file_path) @session.click_button('Upload Single') expect(@session).to have_content(File.read(@test_file_path)) end @@ -48,25 +48,25 @@ Capybara::SpecHelper.spec "#attach_file" do end it "should send content type text/plain when uploading a text file" do - @session.attach_file "Single Document", @test_file_path + @session.attach_file "Single Document", attachment_path(@test_file_path) @session.click_button 'Upload Single' expect(@session).to have_content('text/plain') end it "should send content type image/jpeg when uploading an image" do - @session.attach_file "Single Document", @test_jpg_file_path + @session.attach_file "Single Document", attachment_path(@test_jpg_file_path) @session.click_button 'Upload Single' expect(@session).to have_content('image/jpeg') end it "should not break when uploading a file without extension" do - @session.attach_file "Single Document", @no_extension_file_path + @session.attach_file "Single Document", attachment_path(@no_extension_file_path) @session.click_button 'Upload Single' expect(@session).to have_content(File.read(@no_extension_file_path)) end it "should not break when using HTML5 multiple file input" do - @session.attach_file "Multiple Documents", @test_file_path + @session.attach_file "Multiple Documents", attachment_path(@test_file_path) @session.click_button('Upload Multiple') expect(@session).to have_content(File.read(@test_file_path)) expect(@session.body).to include("1 | ") # number of files @@ -74,7 +74,8 @@ Capybara::SpecHelper.spec "#attach_file" do it "should not break when using HTML5 multiple file input uploading multiple files" do pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/ - @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path] + @session.attach_file "Multiple Documents", + [@test_file_path, @another_test_file_path].map {|f| attachment_path(f)} @session.click_button('Upload Multiple') expect(@session.body).to include("2 | ") # number of files expect(@session.body).to include(File.read(@test_file_path)) @@ -91,7 +92,7 @@ Capybara::SpecHelper.spec "#attach_file" do it "should raise an error" do msg = "Unable to find visible file field \"does not exist\" that is not disabled" expect do - @session.attach_file('does not exist', @test_file_path) + @session.attach_file('does not exist', attachment_path(@test_file_path)) end.to raise_error(Capybara::ElementNotFound, msg) end end @@ -104,14 +105,14 @@ Capybara::SpecHelper.spec "#attach_file" do context "with :exact option" do it "should set a file path by partial label when false" do - @session.attach_file "Imag", __FILE__, exact: false + @session.attach_file "Imag", attachment_path(__FILE__), exact: false @session.click_button('awesome') expect(extract_results(@session)['image']).to eq(File.basename(__FILE__)) end it "should not allow partial matches when true" do expect do - @session.attach_file "Imag", __FILE__, exact: true + @session.attach_file "Imag", attachment_path(__FILE__), exact: true end.to raise_error(Capybara::ElementNotFound) end end @@ -119,30 +120,37 @@ Capybara::SpecHelper.spec "#attach_file" do context "with :make_visible option", requires: %i[js es_args] do it "applies a default style change when true" do @session.visit('/with_js') - expect { @session.attach_file("hidden_file", __FILE__) }.to raise_error Capybara::ElementNotFound + expect { @session.attach_file("hidden_file", attachment_path(__FILE__)) }.to raise_error Capybara::ElementNotFound expect do - @session.attach_file("hidden_file", __FILE__, make_visible: true) + @session.attach_file("hidden_file", attachment_path(__FILE__), make_visible: true) end.not_to raise_error end it "accepts a hash of styles to be applied" do @session.visit('/with_js') expect do - @session.attach_file("hidden_file", __FILE__, make_visible: { opacity: 1, display: 'block' }) + @session.attach_file("hidden_file", attachment_path(__FILE__), make_visible: {opacity: 1, display: 'block' }) end.not_to raise_error end it "raises an error when the file input is not made visible" do @session.visit('/with_js') expect do - @session.attach_file("hidden_file", __FILE__, make_visible: { color: 'red' }) + @session.attach_file("hidden_file", attachment_path(__FILE__), make_visible: {color: 'red' }) end.to raise_error(Capybara::ExpectationNotMet) end it "resets the style when done" do @session.visit('/with_js') - @session.attach_file("hidden_file", __FILE__, make_visible: true) + @session.attach_file("hidden_file", attachment_path(__FILE__), make_visible: true) expect(@session.evaluate_script("arguments[0].style.display", @session.find(:css, '#hidden_file', visible: :all))).to eq 'none' end end + + + private + + def attachment_path(path) + Gem.win_platform? ? path.to_s.gsub('/', '\\') : path.to_s + end end diff --git a/lib/capybara/spec/session/save_screenshot_spec.rb b/lib/capybara/spec/session/save_screenshot_spec.rb index 2b10e6df..94b68050 100644 --- a/lib/capybara/spec/session/save_screenshot_spec.rb +++ b/lib/capybara/spec/session/save_screenshot_spec.rb @@ -16,7 +16,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do @session.save_screenshot - regexp = Regexp.new(File.expand_path('capybara-\d+\.png')) + regexp = Regexp.new(File.join(Dir.pwd, 'capybara-\d+\.png')) expect(@session.driver).to have_received(:save_screenshot).with(regexp, {}) end @@ -36,7 +36,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do @session.save_screenshot - regexp = Regexp.new(File.expand_path('capybara-\d+\.png', alternative_path)) + regexp = Regexp.new(File.join(alternative_path, 'capybara-\d+\.png')) expect(@session.driver).to have_received(:save_screenshot).with(regexp, {}) end diff --git a/spec/server_spec.rb b/spec/server_spec.rb index c830ff4a..aecca8e1 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -35,7 +35,7 @@ RSpec.describe Capybara::Server do ensure Capybara.server_host = nil end - end unless ENV['TRAVIS'] and (RUBY_ENGINE == 'jruby') + end unless (ENV['TRAVIS'] && (RUBY_ENGINE == 'jruby') or Gem.win_platform?) it "should use specified port" do Capybara.server_port = 22789