From f64f0a34717b217b3f1ce0780a3b4c6d0a1414f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 27 Dec 2019 15:30:45 -0300 Subject: [PATCH] Fix test with new capybara --- Gemfile.lock | 128 +++++++++--------- .../dispatch/system_testing/driver_test.rb | 30 +++- 2 files changed, 90 insertions(+), 68 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 336bf63fb19..50d571b6c3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/QueueClassic/queue_classic.git - revision: 4260d8963ddef91bdb9ae390d93e811521b83350 + revision: 655143b7952fa011346a00f94d628407aa4e0056 specs: queue_classic (4.0.0.pre.alpha1) pg (>= 0.17, < 2.0) @@ -100,16 +100,16 @@ PATH GEM remote: https://rubygems.org/ specs: - activerecord-jdbc-adapter (52.3-java) - activerecord (~> 5.2.0) - activerecord-jdbcmysql-adapter (52.3-java) - activerecord-jdbc-adapter (= 52.3) + activerecord-jdbc-adapter (60.1-java) + activerecord (~> 6.0.0) + activerecord-jdbcmysql-adapter (60.1-java) + activerecord-jdbc-adapter (= 60.1) jdbc-mysql (~> 5.1.36, < 9) - activerecord-jdbcpostgresql-adapter (52.3-java) - activerecord-jdbc-adapter (= 52.3) + activerecord-jdbcpostgresql-adapter (60.1-java) + activerecord-jdbc-adapter (= 60.1) jdbc-postgres (>= 9.4, < 43) - activerecord-jdbcsqlite3-adapter (52.3-java) - activerecord-jdbc-adapter (= 52.3) + activerecord-jdbcsqlite3-adapter (60.1-java) + activerecord-jdbc-adapter (= 60.1) jdbc-sqlite3 (~> 3.8, < 3.30) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) @@ -117,21 +117,21 @@ GEM ansi (1.5.0) ast (2.4.0) aws-eventstream (1.0.3) - aws-partitions (1.221.0) - aws-sdk-core (3.68.1) + aws-partitions (1.260.0) + aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.27.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.48.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.60.1) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.19.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-sns (1.21.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) @@ -175,11 +175,11 @@ GEM msgpack (~> 1.0) bootsnap (1.4.5-java) msgpack (~> 1.0) - builder (3.2.3) + builder (3.2.4) bunny (2.14.3) amq-protocol (~> 2.3, >= 2.3.0) byebug (11.0.1) - capybara (3.29.0) + capybara (3.30.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -197,7 +197,7 @@ GEM cookiejar (0.3.3) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) curses (1.0.2) daemons (1.3.1) dalli (2.7.10) @@ -224,7 +224,7 @@ GEM event_emitter (0.2.6) eventmachine (1.2.7) execjs (2.7.0) - faraday (0.17.0) + faraday (0.17.1) multipart-post (>= 1.2, < 3) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) @@ -248,32 +248,32 @@ GEM raabro (~> 1.1) globalid (0.4.2) activesupport (>= 4.2.0) - google-api-client (0.32.1) + google-api-client (0.36.2) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.10.0) + googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - signet (~> 0.10) - google-cloud-core (1.3.1) + signet (~> 0.12) + google-cloud-core (1.4.1) google-cloud-env (~> 1.0) - google-cloud-env (1.2.1) + google-cloud-env (1.3.0) faraday (~> 0.11) - google-cloud-storage (1.21.1) + google-cloud-storage (1.25.0) addressable (~> 2.5) digest-crc (~> 0.4) - google-api-client (~> 0.26) + google-api-client (~> 0.33) google-cloud-core (~> 1.2) - googleauth (>= 0.6.2, < 0.10.0) + googleauth (~> 0.9) mini_mime (~> 1.0) - googleauth (0.9.0) + googleauth (0.10.0) faraday (~> 0.12) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) + signet (~> 0.12) hashdiff (1.0.0) hiredis (0.6.3) hiredis (0.6.3-java) @@ -281,7 +281,7 @@ GEM httpclient (2.8.3) i18n (1.7.0) concurrent-ruby (~> 1.0) - image_processing (1.9.3) + image_processing (1.10.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.13, < 3) jaro_winkler (1.5.4) @@ -300,31 +300,31 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.3.0) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - memoist (0.16.0) + memoist (0.16.2) method_source (0.9.2) mimemagic (0.3.3) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) + minitest (5.13.0) minitest-bisect (1.5.1) minitest-server (~> 1.0) path_expander (~> 1.1) - minitest-reporters (1.4.0) + minitest-reporters (1.4.2) ansi builder minitest (>= 5.0) ruby-progressbar minitest-retry (0.1.9) minitest (>= 5.0) - minitest-server (1.0.5) + minitest-server (1.0.6) minitest (~> 5.0) mono_logger (1.1.0) msgpack (1.3.1) @@ -333,42 +333,42 @@ GEM msgpack (1.3.1-x86-mingw32) multi_json (1.14.1) multipart-post (2.1.1) - mustache (1.1.0) + mustache (1.1.1) mustermann (1.0.3) mysql2 (0.5.3) mysql2 (0.5.3-x64-mingw32) mysql2 (0.5.3-x86-mingw32) nio4r (2.5.2) nio4r (2.5.2-java) - nokogiri (1.10.4) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - nokogiri (1.10.4-java) - nokogiri (1.10.4-x64-mingw32) + nokogiri (1.10.7-java) + nokogiri (1.10.7-x64-mingw32) mini_portile2 (~> 2.4.0) - nokogiri (1.10.4-x86-mingw32) + nokogiri (1.10.7-x86-mingw32) mini_portile2 (~> 2.4.0) os (1.0.1) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.0) ast (~> 2.4.0) path_expander (1.1.0) pg (1.2.0) pg (1.2.0-x64-mingw32) pg (1.2.0-x86-mingw32) psych (3.1.0) - public_suffix (4.0.1) - puma (4.2.1) + public_suffix (4.0.2) + puma (4.3.1) nio4r (~> 2.0) - puma (4.2.1-java) + puma (4.3.1-java) nio4r (~> 2.0) que (0.14.3) qunit-selenium (0.0.4) selenium-webdriver thor raabro (1.1.6) - racc (1.4.15) + racc (1.4.16) rack (2.0.8) - rack-cache (1.9.0) + rack-cache (1.10.0) rack (>= 0.4) rack-protection (2.0.7) rack @@ -382,14 +382,14 @@ GEM rails-html-sanitizer (1.3.0) loofah (~> 2.3) rainbow (3.0.0) - rake (13.0.0) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.0) + rdoc (6.2.1) redcarpet (3.2.3) redis (4.1.3) - redis-namespace (1.6.0) + redis-namespace (1.7.0) redis (>= 3.0.4) regexp_parser (1.6.0) representable (3.0.4) @@ -408,20 +408,20 @@ GEM resque (>= 1.26) rufus-scheduler (~> 3.2) retriable (3.1.2) - rubocop (0.77.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.5.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) - rubocop-rails (2.3.2) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - ruby-vips (2.0.15) + ruby-vips (2.0.16) ffi (~> 1.9) rubyzip (2.0.0) rufus-scheduler (3.6.0) @@ -443,19 +443,19 @@ GEM tilt sdoc (1.0.0) rdoc (>= 5.0) - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sequel (5.25.0) + sequel (5.27.0) serverengine (2.0.7) sigdump (~> 0.2.2) - sidekiq (6.0.1) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) redis (>= 4.1.0) sigdump (0.2.4) - signet (0.11.0) + signet (0.12.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -480,14 +480,14 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - stackprof (0.2.13) + stackprof (0.2.15) sucker_punch (2.1.2) concurrent-ruby (~> 1.0) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.0.0) + thor (1.0.1) thread_safe (0.3.6) thread_safe (0.3.6-java) tilt (2.0.10) @@ -517,7 +517,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.0.7) + webpacker (4.2.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) diff --git a/actionpack/test/dispatch/system_testing/driver_test.rb b/actionpack/test/dispatch/system_testing/driver_test.rb index 34a07b5ce7d..3cf372aaf09 100644 --- a/actionpack/test/dispatch/system_testing/driver_test.rb +++ b/actionpack/test/dispatch/system_testing/driver_test.rb @@ -64,7 +64,13 @@ class DriverTest < ActiveSupport::TestCase driver.use browser_options = driver.__send__(:browser_options) - expected = { "goog:chromeOptions" => { args: ["start-maximized"], mobileEmulation: { deviceName: "iphone 6" }, prefs: { detach: true } } } + expected = { + "goog:chromeOptions" => { + "args" => ["start-maximized"], + "mobileEmulation" => { "deviceName" => "iphone 6" }, + "prefs" => { "detach" => true } + } + } assert_equal expected, browser_options[:options].as_json end @@ -77,7 +83,13 @@ class DriverTest < ActiveSupport::TestCase driver.use browser_options = driver.__send__(:browser_options) - expected = { "goog:chromeOptions" => { args: ["--headless", "start-maximized"], mobileEmulation: { deviceName: "iphone 6" }, prefs: { detach: true } } } + expected = { + "goog:chromeOptions" => { + "args" => ["--headless", "start-maximized"], + "mobileEmulation" => { "deviceName" => "iphone 6" }, + "prefs" => { "detach" => true } + } + } assert_equal expected, browser_options[:options].as_json end @@ -89,7 +101,12 @@ class DriverTest < ActiveSupport::TestCase driver.use browser_options = driver.__send__(:browser_options) - expected = { "moz:firefoxOptions" => { args: ["--host=127.0.0.1"], prefs: { "browser.startup.homepage" => "http://www.seleniumhq.com/" } } } + expected = { + "moz:firefoxOptions" => { + "args" => ["--host=127.0.0.1"], + "prefs" => { "browser.startup.homepage" => "http://www.seleniumhq.com/" } + } + } assert_equal expected, browser_options[:options].as_json end @@ -101,7 +118,12 @@ class DriverTest < ActiveSupport::TestCase driver.use browser_options = driver.__send__(:browser_options) - expected = { "moz:firefoxOptions" => { args: ["-headless", "--host=127.0.0.1"], prefs: { "browser.startup.homepage" => "http://www.seleniumhq.com/" } } } + expected = { + "moz:firefoxOptions" => { + "args" => ["-headless", "--host=127.0.0.1"], + "prefs" => { "browser.startup.homepage" => "http://www.seleniumhq.com/" } + } + } assert_equal expected, browser_options[:options].as_json end