Resolve conflicts with July 2024 OSEM

snap-cloud · Aug 3, 2024 · 173abf7 · 173abf7
2 parents a2dc6cc + b2e3e41
commit 173abf7
Show file tree

Hide file tree

Showing 96 changed files with 1,778 additions and 2,090 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,6 @@
 .bundle/cache
 .git/
 coverage/
-db/*.sqlite3
 Dockerfile
 docker-compose.*
 log/

diff --git a/.github/workflows/next-rails.yml b/.github/workflows/next-rails.yml
@@ -12,25 +12,23 @@ jobs:
     runs-on: ubuntu-latest
     name: next-rails
     env:
-      OSEM_DB_ADAPTER: sqlite3
+      OSEM_DB_HOST: localhost
       RAILS_ENV: test
     strategy:
       matrix:
         suite: [models, features, controllers, ability, leftovers]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Sets env vars for next-rails
         run: |
           echo "BUNDLE_GEMFILE=Gemfile.next" >> $GITHUB_ENV
           echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.0
           bundler-cache: true
       - name: Prepare spec
         run: |
-          rm -f osem_test osem_development
           bundle exec rake db:setup --trace
           bundle exec bin/rails webdrivers:chromedriver:update
       - name: spec/${{ matrix.suite }}
@@ -41,3 +39,15 @@ jobs:
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
           coverage-reports: coverage/coverage.xml
+    services:
+      postgres:
+        image: postgres:16-alpine
+        env:
+          POSTGRES_PASSWORD: mysecretpassword
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
@@ -13,7 +13,7 @@ jobs:
       PRONTO_PULL_REQUEST_ID: "${{ github.event.pull_request.number }}"
       PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -27,15 +27,15 @@ jobs:
     runs-on: ubuntu-latest
     name: spec
     env:
-      OSEM_DB_ADAPTER: sqlite3
+      OSEM_DB_HOST: localhost
       RAILS_ENV: test
       CCTR: ./cc-test-reporter
       CCTR_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     strategy:
       matrix:
         suite: [models, features, controllers, ability, leftovers, cucumber]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -53,7 +53,6 @@ jobs:
           $CCTR before-build
       - name: Prepare spec
         run: |
-          rm -f osem_test osem_development
           bundle exec rake db:setup --trace
           bundle exec bin/rails webdrivers:chromedriver:update
           bundle exec rake factory_bot:lint RAILS_ENV=test
@@ -70,7 +69,7 @@ jobs:
       #   with:
       #     project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
       #     coverage-reports: coverage/coverage.xml
-      - name: Upload Capybara Failure Screenshots
+    - name: Upload Capybara Failure Screenshots
         uses: actions/upload-artifact@v3
         if: always()
         with:
@@ -83,3 +82,16 @@ jobs:
       #     $CCTR sum-coverage coverage/codeclimate.*.json
       #     $CCTR upload-coverage --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
       #     $CCTR after-build --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
+
+    services:
+      postgres:
+        image: postgres:16-alpine
+        env:
+          POSTGRES_PASSWORD: mysecretpassword
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
diff --git a/.gitignore b/.gitignore
@@ -12,13 +12,6 @@ Desktop.ini
 ._*
 Thumbs.db
 
-# Files that might appear on external disks
-.Spotlight-V100
-.Trashes
-
-
-# Legacy from before Feb 2021
-/db/test.sqlite3-journal
 config/application.rb
 config/config.yml
 config/local_env.yml
@@ -39,7 +32,6 @@ capybara-*.html
 /vendor/bundle
 /log/*
 /tmp/*
-/db/*.sqlite3
 /public/system/*
 /coverage/
 /spec/tmp/*

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
@@ -1,14 +1,18 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2021-08-13 13:00:39 +0000 using Haml-Lint version 0.28.0.
+# on 2024-03-26 11:01:18 +0000 using Haml-Lint version 0.57.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
 
-  # Offense count: 1141
+  # Offense count: 401
+  InstanceVariables:
+    enabled: false
+
+  # Offense count: 1378
   RuboCop:
     enabled: false
 
@@ -28,15 +32,11 @@ linters:
       - "app/views/admin/versions/_object_desc_and_link.html.haml"
       - "app/views/booths/index.html.haml"
 
-  # Offense count: 981
+  # Offense count: 967
   LineLength:
     enabled: false
 
-  # Offense count: 206
-  InstanceVariables:
-    enabled: false
-
-  # Offense count: 12
+  # Offense count: 13
   ViewLength:
     exclude:
       - "app/views/admin/booths/index.html.haml"
@@ -50,9 +50,9 @@ linters:
       - "app/views/admin/versions/_object_desc_and_link.html.haml"
       - "app/views/conference_registrations/show.html.haml"
       - "app/views/layouts/_admin_sidebar.html.haml"
+      - "app/views/proposals/_form.html.haml"
       - "app/views/proposals/index.html.haml"
       - "app/views/proposals/show.html.haml"
-      - "app/views/proposals/_form.html.haml"
 
   # Offense count: 28
   IdNames:
@@ -70,21 +70,34 @@ linters:
       - "app/views/admin/users/show.html.haml"
       - "app/views/users/edit.html.haml"
 
-  # Offense count: 38
+  # Offense count: 37
   InlineStyles:
     enabled: false
 
-  # Offense count: 3
+  # Offense count: 378
+  SpaceInsideHashAttributes:
+    enabled: false
+
+  # Offense count: 10
+  TrailingEmptyLines:
+    exclude:
+      - "app/views/admin/conferences/_form_fields.html.haml"
+      - "app/views/admin/events/_all_with_comments.csv.haml"
+      - "app/views/admin/events/_form.html.haml"
+      - "app/views/admin/events/_proposal.html.haml"
+      - "app/views/admin/schedules/_form.html.haml"
+      - "app/views/admin/sponsorship_levels/_form.html.haml"
+      - "app/views/application/_big_statistic.haml"
+      - "app/views/booths/_form.html.haml"
+      - "app/views/schedules/_schedule_item.html.haml"
+      - "app/views/users/edit.html.haml"
+
+  # Offense count: 1
   UnnecessaryInterpolation:
     exclude:
       - "app/views/admin/conferences/_recent_submissions.html.haml"
-      - "app/views/proposals/new.html.haml"
-
-  # Offense count: 262
-  SpaceInsideHashAttributes:
-    enabled: false
 
-  # Offense count: 24
+  # Offense count: 21
   ClassesBeforeIds:
     exclude:
       - "app/views/admin/emails/index.html.haml"
@@ -94,11 +107,9 @@ linters:
       - "app/views/admin/venues/_form.html.haml"
       - "app/views/conferences/index.html.haml"
       - "app/views/devise/shared/_help.html.haml"
-      - "app/views/devise/shared/_sign_in_form_embedded.html.haml"
       - "app/views/layouts/_navigation.html.haml"
-      - "app/views/proposals/_form.html.haml"
 
-  # Offense count: 19
+  # Offense count: 16
   UnnecessaryStringOutput:
     exclude:
       - "app/views/admin/event_types/index.html.haml"
@@ -108,15 +119,13 @@ linters:
       - "app/views/admin/versions/_object_desc_and_link.html.haml"
       - "app/views/admin/volunteers/show.html.haml"
       - "app/views/conference_registrations/show.html.haml"
-      - "app/views/conferences/_conference_details.html.haml"
       - "app/views/proposals/_encouragement_text.html.haml"
-      - "app/views/proposals/_form.html.haml"
-      - "app/views/users/edit.html.haml"
       - "app/views/users/show.html.haml"
 
-  # Offense count: 31
-  SpaceBeforeScript:
-    enabled: false
+  # Offense count: 1
+  ImplicitDiv:
+    exclude:
+      - "app/views/admin/registrations/index.html.haml"
 
   # Offense count: 9
   MultilinePipe:
@@ -134,10 +143,13 @@ linters:
       - "app/views/layouts/_navigation.html.haml"
       - "app/views/schedules/events.html.haml"
 
-  # Offense count: 7
+  # Offense count: 30
+  SpaceBeforeScript:
+    enabled: false
+
+  # Offense count: 5
   TrailingWhitespace:
     exclude:
-      - "app/views/admin/volunteers/index.html.haml"
       - "app/views/admin/volunteers/show.html.haml"
       - "app/views/conference_registrations/_volunteer.html.haml"
       - "app/views/devise/passwords/new.html.haml"

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,6 @@
 require:
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-rails
   - rubocop-capybara
   - rubocop-performance