From b2a56376cd26366004d9c673117e45531167af79 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 19 Sep 2021 05:05:09 +0200
Subject: [PATCH 1/4] Fix running jasmine tests in docker

closes #8299
---
 docker/develop/Dockerfile                  | 3 +++
 spec/javascripts/support/jasmine_helper.rb | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index 45617302d..a33f8a08c 100644
--- a/docker/develop/Dockerfile
+++ b/docker/develop/Dockerfile
@@ -20,6 +20,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
         nodejs \
         gosu \
     && \
+    curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o ./google-chrome.deb && \
+    apt install -y -qq --no-install-recommends ./google-chrome.deb && \
+    rm ./google-chrome.deb && \
     rm -rf /var/lib/apt/lists/*
 
 
diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb
index d424f6875..b25419755 100644
--- a/spec/javascripts/support/jasmine_helper.rb
+++ b/spec/javascripts/support/jasmine_helper.rb
@@ -5,4 +5,7 @@ Jasmine.configure do |config|
   config.runner_browser = :chromeheadless
   config.chrome_startup_timeout = 20
   config.chrome_cli_options["autoplay-policy"] = "no-user-gesture-required"
+  config.chrome_cli_options["disable-gpu"] = nil
+  config.chrome_cli_options["disable-software-rasterizer"] = nil
+  config.chrome_cli_options["disable-dev-shm-usage"] = nil
 end

From 0bb4ffce89a1816a404aaf846d9d67c21118c84a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 29 Sep 2021 23:39:58 +0200
Subject: [PATCH 2/4] Disable Style/AccessorGrouping in rubocop

It makes more sense to allow to structure and group accessors how it
makes sense in the code instead of enforcing it to be grouped in a
specific way.
---
 .rubocop.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 71c3b4bd0..eca15ddb9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -179,6 +179,10 @@ Layout/DotPosition:
 Style/HashEachMethods:
   Enabled: true
 
+# It makes more sense to allow to structure and group them how it makes sense in the code
+Style/AccessorGrouping:
+  Enabled: false
+
 # TODO: Enable with Ruby 2.5
 Style/HashTransformKeys:
   Enabled: false

From 59baef3146b7ca93bb4e85903a6f9032eefa4d1a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 29 Sep 2021 23:42:48 +0200
Subject: [PATCH 3/4] Enable HashTransform rules in rubocop because we have
 ruby >= 2.5 now

---
 .rubocop.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index eca15ddb9..e1a7219a2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -182,9 +182,3 @@ Style/HashEachMethods:
 # It makes more sense to allow to structure and group them how it makes sense in the code
 Style/AccessorGrouping:
   Enabled: false
-
-# TODO: Enable with Ruby 2.5
-Style/HashTransformKeys:
-  Enabled: false
-Style/HashTransformValues:
-  Enabled: false

From dc99f0f77a7d501905777ada47e30cafba4a6dbd Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 29 Sep 2021 23:44:24 +0200
Subject: [PATCH 4/4] Fix namespace for LineLength rule

closes #8303
---
 db/migrate/0000_create_schema.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb
index e73953360..cbf0ffc72 100644
--- a/db/migrate/0000_create_schema.rb
+++ b/db/migrate/0000_create_schema.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateSchema < ActiveRecord::Migration[4.2]
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
   def up
     create_table :account_deletions do |t|
       t.string   :diaspora_handle
@@ -672,5 +672,5 @@ class CreateSchema < ActiveRecord::Migration[4.2]
 
     add_foreign_key :share_visibilities, :users, name: :share_visibilities_user_id_fk, on_delete: :cascade
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
 end