From c831786e3ae16b023ef4ca72b0f804905818db7e Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 24 Jul 2019 10:14:19 +0000
Subject: [PATCH] Update capybara (~> 3.25.0) (#31657).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch by Takenori TAKAKI and Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@18330 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile                           | 2 +-
 test/system/issues_import_test.rb | 1 +
 test/system/issues_test.rb        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 37449f09f..2d74ae041 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,7 @@ group :test do
   gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
   # For running system tests
   gem 'puma', '~> 3.7'
-  gem "capybara", '~> 2.13'
+  gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
   gem "selenium-webdriver"
   # RuboCop
   gem 'rubocop', '~> 0.72.0'
diff --git a/test/system/issues_import_test.rb b/test/system/issues_import_test.rb
index 038949aab..b23f54cf6 100644
--- a/test/system/issues_import_test.rb
+++ b/test/system/issues_import_test.rb
@@ -28,6 +28,7 @@ class IssuesImportTest < ApplicationSystemTestCase
   def test_import_issues_without_failures
     log_user('jsmith', 'jsmith')
     visit '/issues'
+    find('div.contextual>span.drdn').click
     click_on 'Import'
 
     attach_file 'file', Rails.root.join('test/fixtures/files/import_issues.csv')
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 8118277bf..28eccedbc 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -345,6 +345,7 @@ class IssuesTest < ApplicationSystemTestCase
     log_user('admin', 'admin')
 
     visit '/issues/1'
+    page.driver.execute_script('$.fx.off = true;')
     page.first(:link, 'Edit').click
     page.click_link('View all trackers description')
     assert page.has_css?('#trackers_description')
-- 
2.39.5