Merge branch 'release/1.1.0'

my-zivi · Apr 27, 2021 · 148d0fb · 148d0fb
2 parents ee3bd84 + 210b127
commit 148d0fb
Show file tree

Hide file tree

Showing 205 changed files with 4,378 additions and 888 deletions.
diff --git a/.env.example b/.env.example
@@ -31,3 +31,5 @@ SIDEKIQ_USERNAME=username
 SIDEKIQ_PASSWORD=password
 
 RAILS_ADMIN_THEME=myzivi_theme
+SMARTJOBBOARD_PUBLIC_URL=https://www.myzivi.ch/
+DEMO_URL=https://calendly.com/myzivi-joshua/onlinedemo
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,28 @@
+# https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - ruby
+    rebase-strategy: auto
+    open-pull-requests-limit: 2
+    target-branch: develop
+    pull-request-branch-name:
+      separator: "-"
+    versioning-strategy: increase-if-necessary
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - javascript
+    open-pull-requests-limit: 2
+    rebase-strategy: auto
+    target-branch: develop
+    pull-request-branch-name:
+      separator: "-"
+    versioning-strategy: increase
diff --git a/.reek.yml b/.reek.yml
@@ -58,6 +58,8 @@ directories:
   "app/components":
     TooManyInstanceVariables:
       enabled: false
+    BooleanParameter:
+      enabled: false
 
 exclude_paths:
   - tmp

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -62,6 +62,10 @@ Rails/Output:
     - 'db/seeds.rb'
     - 'db/seed_data/*.rb'
 
+Rails/OutputSafety:
+  Exclude:
+    - 'spec/helpers/*.rb'
+
 RSpec/NestedGroups:
   Max: 6
 

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -21,9 +21,9 @@ blocks:
       jobs:
         - name: cache
           commands:
-            - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
+            - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
             - 'cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master'
-            - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
+            - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
             - 'cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master'
             - bundle install --deployment -j 4 --path vendor/bundle
             - nvm install
@@ -50,9 +50,9 @@ blocks:
       prologue:
         commands:
           - checkout --use-cache
-          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
+          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
           - 'cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master'
-          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
+          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
           - 'cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master'
           - bundle install --deployment --path vendor/bundle
           - nvm install
@@ -74,6 +74,11 @@ blocks:
             - sem-service start postgres 12
             - 'bundle exec rails db:create db:structure:load'
             - bin/system-tests
+      epilogue:
+        on_fail:
+          commands:
+            - artifact push job logs/test.log
+            - artifact push job screenshots
   - name: Percy
     dependencies:
       - Tests
@@ -88,9 +93,9 @@ blocks:
       prologue:
         commands:
           - checkout --use-cache
-          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
+          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
           - 'cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master'
-          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
+          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
           - 'cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master'
           - sudo apt-get update
           - sudo apt-get install libxss1
@@ -103,9 +108,16 @@ blocks:
         - name: Capture Screenshots
           commands:
             - NO_COVERAGE=true yarn run percy:capture-screenshots
+      epilogue:
+        on_fail:
+          commands:
+            - artifact push job log/test.log
+            - artifact push job screenshots
   - name: Performance Check
     dependencies:
       - Cache
+    run:
+      when: "branch = 'master' OR branch = 'develop'"
     task:
       secrets:
         - name: my-zivi
@@ -114,18 +126,16 @@ blocks:
           value: 'postgresql://postgres@localhost/test?encoding=utf8'
         - name: RAILS_ENV
           value: production
-        - name: NODE_ENV
-          value: production
         - name: RAILS_SERVE_STATIC_FILES
           value: 'true'
         - name: SECRET_KEY_BASE
           value: 50490f620b684654c2d1232a16852620e20fee34f5bc38e56b66f73a2d57504d037be521387feceedac58e7cc725f292c4c3cbda3bd5977fcd7ae2748c4c27f7
       prologue:
         commands:
           - checkout --use-cache
-          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
+          - 'cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master'
           - 'cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master'
-          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
+          - 'cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master'
           - 'cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master'
           - sudo apt-get update
           - sudo apt-get install libxss1

diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,29 @@
+{
+  "extends": "stylelint-config-twbs-bootstrap/scss",
+  "rules": {
+    "selector-no-qualifying-type": [
+      true,
+      {
+        "ignore": ["attribute", "class"]
+      }
+    ],
+    "scss/at-import-partial-extension": null,
+    "scss/selector-no-redundant-nesting-selector": null,
+    "selector-class-pattern": null,
+    "selector-max-class": 6,
+    "selector-max-id": 1,
+    "declaration-colon-space-after": "always-single-line",
+    "declaration-bang-space-after": "never",
+    "declaration-bang-space-before": "always",
+    "block-opening-brace-space-before": "always",
+    "block-opening-brace-newline-before": "never-single-line",
+    "string-quotes": "single",
+    "declaration-no-important": null,
+    "selector-max-type": [
+      4,
+      {
+        "ignore": ["child"]
+      }
+    ]
+  }
+}
diff --git a/Gemfile b/Gemfile
@@ -11,9 +11,11 @@ gem 'devise-i18n'
 gem 'devise_invitable'
 gem 'dotenv-rails'
 gem 'fillable-pdf'
+gem 'flutie'
 gem 'hexapdf'
 gem 'holidays'
 gem 'iban-tools'
+gem 'nokogiri'
 gem 'pg', '>= 0.18', '< 2.0'
 gem 'prawn'
 gem 'prawn-table'
@@ -38,7 +40,8 @@ gem 'rails_admin', '~> 2.0'
 group :production do
   gem 'lograge'
   gem 'norobots'
-  gem 'sentry-raven'
+  gem 'sentry-rails'
+  gem 'sentry-ruby'
 end
 
 group :development, :test do
@@ -73,14 +76,17 @@ end
 
 group :test do
   gem 'climate_control'
-  gem 'i18n-tasks', '~> 0.9.31'
+  gem 'i18n-tasks'
   gem 'pdf-inspector', require: 'pdf/inspector'
   gem 'percy-capybara'
   gem 'rails-controller-testing'
   gem 'shoulda-matchers'
   gem 'simplecov'
   gem 'simplecov-console'
+  gem 'super_diff'
   gem 'test-prof'
+  gem 'vcr'
+  gem 'webmock'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem