remove webdrivers gem and increase version of selenium-webdrivers (#655)

* remove webdrivers gem and increase version of selenium-webdrivers * remove puzzle-shell and package-lock.json
puzzle · Apr 12, 2024 · 69b2b99 · 69b2b99
1 parent 5d9522b
commit 69b2b99
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 1,817 deletions.
diff --git a/Gemfile b/Gemfile
@@ -72,10 +72,9 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem 'selenium-webdriver', '>= 4.11.8'
   gem 'simplecov'
   # Use fixed version of webdrivers to avoid compatibility issues with chrome and chromedriver
-  gem 'webdrivers', '~> 5.3', '>= 5.3.1'
 end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -82,7 +82,6 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.6)
     bindata (2.5.0)
     bleib (0.0.8)
     bootsnap (1.18.3)
@@ -115,9 +114,8 @@ GEM
     choice (0.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
-    config (5.1.0)
+    config (5.4.0)
       deep_merge (~> 1.2, >= 1.2.1)
-      dry-validation (~> 1.0, >= 1.0.0)
     countries (6.0.0)
       unaccent (~> 0.3)
     crass (1.0.6)
@@ -131,7 +129,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.4)
     deep_merge (1.2.2)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -141,41 +139,8 @@ GEM
     docile (1.4.0)
     domain_name (0.6.20240107)
     dotenv (3.1.0)
-    dry-configurable (1.1.0)
-      dry-core (~> 1.0, < 2)
-      zeitwerk (~> 2.6)
-    dry-core (1.0.1)
-      concurrent-ruby (~> 1.0)
-      zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-initializer (3.1.1)
-    dry-logic (1.5.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      zeitwerk (~> 2.6)
-    dry-schema (1.13.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 1.0, >= 1.0.1)
-      dry-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-logic (>= 1.4, < 2)
-      dry-types (>= 1.7, < 2)
-      zeitwerk (~> 2.6)
-    dry-types (1.7.2)
-      bigdecimal (~> 3.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0)
-      dry-inflector (~> 1.0)
-      dry-logic (~> 1.4)
-      zeitwerk (~> 2.6)
-    dry-validation (1.10.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-schema (>= 1.12, < 2)
-      zeitwerk (~> 2.6)
     erubi (1.12.0)
-    faker (3.2.3)
+    faker (3.3.1)
       i18n (>= 1.8.11, < 2)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -208,7 +173,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
-    json (2.7.1)
+    json (2.7.2)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -217,7 +182,7 @@ GEM
       faraday (~> 2.0)
       faraday-follow_redirects
     jsonapi-renderer (0.2.2)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
     keycloak-api-rails (0.12.2)
       json-jwt (>= 1.11.0)
@@ -240,7 +205,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
+    mime-types-data (3.2024.0305)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.22.3)
@@ -256,11 +221,11 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.0)
-    nokogiri (1.16.2-x86_64-linux)
+    nio4r (2.7.1)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -269,9 +234,9 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    odf-report (0.7.3)
+    odf-report (0.8.1)
       mime-types
-      nokogiri (>= 1.10.0)
+      nokogiri (>= 1.12.0)
       rubyzip (>= 1.3.0)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
@@ -293,7 +258,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pg (1.5.5)
+    pg (1.5.6)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
@@ -304,11 +269,11 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     psych (3.3.4)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -344,7 +309,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     railties (7.0.8.1)
@@ -355,7 +320,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -378,33 +343,33 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
+    rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -414,7 +379,8 @@ GEM
     seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    selenium-webdriver (4.10.0)
+    selenium-webdriver (4.19.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -448,7 +414,7 @@ GEM
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
-    turbo-rails (2.0.4)
+    turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -458,13 +424,9 @@ GEM
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     uri (0.13.0)
-    version_gem (1.1.3)
+    version_gem (1.1.4)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webdrivers (5.3.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0, < 4.11)
     websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -526,7 +488,7 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   seed-fu
-  selenium-webdriver
+  selenium-webdriver (>= 4.11.8)
   sentry-raven
   simplecov
   spring
@@ -535,7 +497,6 @@ DEPENDENCIES
   stimulus-rails
   turbo-rails
   tzinfo-data
-  webdrivers (~> 5.3, >= 5.3.1)
 
 BUNDLED WITH
    2.4.10
diff --git a/app/assets/stylesheets/styles.scss b/app/assets/stylesheets/styles.scss
@@ -75,6 +75,11 @@ pzsh-topbar {
   font-size: 18px;
 }
 
+.puzzle-header {
+  background-color: $skills-blue;
+  height: 40px;
+}
+
 .bg-skills-blue {
   background-color: $skills-blue;
 }

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -21,10 +21,10 @@
             %text.d-flex.align-items-end.ms-2.small= "4.4.0"
           %ul.navbar.text-gray
             %li.d-flex.align-items-center.cursor-pointer.ps-2.pe-2.border-start.border-end.h-100
-              %pzsh-icon.scale-icon-06(name="user")
+              %div.scale-icon-06(name="user")
               %span#username
-                =current_auth_user&.name 
-                - if admin?  
+                =current_auth_user&.name
+                - if admin?
                   (Admin)
             %li.d-flex.align-items-center.cursor-pointer.ps-2.pe-2
               %a.d-flex.align-items-center{:href => "https://github.com/puzzle/skills/issues"}
@@ -35,18 +35,17 @@
                   =link_to "Logout", destroy_auth_user_session_path, data: { "turbo-method": :delete}
                 - elsif devise_mapping.omniauthable?
                   =button_to "Login", omniauth_authorize_path(resource_name, resource_class.omniauth_providers.first), {data: { "turbo": false}, class: "btn btn-link"}
-        %div
-          %pzsh-topbar.p-0
-            %div.d-flex.justify-content-center
-              %ul.navbar
-                %li
-                  %a.nav-link.cursor-pointer.ps-2.pe-2{href: people_path} Profil
-                %li
-                  %a.nav-link.cursor-pointer.ps-2.pe-2= "Skill Suche"
-                %li
-                  %a.nav-link.cursor-pointer.ps-2.pe-2= "CV Suche"
-                %li
-                  %a.nav-link.cursor-pointer.ps-2.pe-2{href: skills_path} Skillset
+        %div.puzzle-header
+          %div.d-flex.h-100
+            %ul.navbar.h-100
+              %li.bg-skills-blue.h-100.d-flex.align-items-center
+                %a.nav-link.cursor-pointer.ps-2.pe-2{href: people_path} Profil
+              %li.bg-skills-blue.h-100.d-flex.align-items-center
+                %a.nav-link.cursor-pointer.ps-2.pe-2= "Skill Suche"
+              %li.bg-skills-blue.h-100.d-flex.align-items-center
+                %a.nav-link.cursor-pointer.ps-2.pe-2= "CV Suche"
+              %li.bg-skills-blue.h-100.d-flex.align-items-center
+                %a.nav-link.cursor-pointer.ps-2.pe-2{href: skills_path} Skillset
       %div.container-fluid
         %div.row.d-flex.justify-content-center
           %div