From cd6eb3de7f3c0da5a04074625772e288ff2c3d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 10 Apr 2021 14:09:59 +0200 Subject: [PATCH] Run jasmine specs using chrome headless --- Gemfile | 1 + Gemfile.lock | 9 ++- .../app/views/content_view_spec.js | 69 +++++++++---------- spec/javascripts/support/jasmine_helper.rb | 8 +++ spec/javascripts/support/jasmine_runner.rb | 23 ------- 5 files changed, 48 insertions(+), 62 deletions(-) create mode 100644 spec/javascripts/support/jasmine_helper.rb delete mode 100644 spec/javascripts/support/jasmine_runner.rb diff --git a/Gemfile b/Gemfile index 88545c5bc..9b83f8d14 100644 --- a/Gemfile +++ b/Gemfile @@ -304,6 +304,7 @@ group :development, :test do gem "cucumber-rails", "2.0.0", require: false # Jasmine (client side application tests (JS)) + gem "chrome_remote", "0.3.0" gem "jasmine", "3.6.0" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org" diff --git a/Gemfile.lock b/Gemfile.lock index 2f84dc66c..018be3526 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,6 +112,8 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) + chrome_remote (0.3.0) + websocket-driver (~> 0.6) chunky_png (1.3.11) citrus (3.0.2) cliver (0.3.2) @@ -232,7 +234,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.12.2) + ffi (1.15.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -319,7 +321,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.1) + http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) @@ -666,7 +668,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) @@ -797,6 +799,7 @@ DEPENDENCIES bootstrap-switch-rails (= 3.3.3) capybara (= 3.15.0) carrierwave (= 1.3.1) + chrome_remote (= 0.3.0) compass-rails (= 3.1.0) configurate (= 0.5.0) cucumber-api-steps (= 0.14) diff --git a/spec/javascripts/app/views/content_view_spec.js b/spec/javascripts/app/views/content_view_spec.js index a10a3cfc6..6e8ebe869 100644 --- a/spec/javascripts/app/views/content_view_spec.js +++ b/spec/javascripts/app/views/content_view_spec.js @@ -37,42 +37,39 @@ describe("app.views.Content", function(){ }); }); - // These tests don't work in PhantomJS because it doesn't support HTML5