Merge branch 'master' into user_schedule

Author: ngetahun

.dockerignore

@@ -1,2 +1,10 @@
+.bundle/cache
+.git/
+coverage/
+db/*.sqlite3
 Dockerfile
 docker-compose.*
+log/
+public/assets/
+public/system/
+tmp/

.github/workflows/next-rails.yml

@@ -0,0 +1,43 @@
+name: Next-rails
+
+on:
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  next-rails:
+    if: contains(github.head_ref, 'next-rails')
+    runs-on: ubuntu-latest
+    name: next-rails
+    env:
+      OSEM_DB_ADAPTER: sqlite3
+      RAILS_ENV: test
+    strategy:
+      matrix:
+        suite: [models, features, controllers, ability, leftovers]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - 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.1.2
+          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 }}
+        run: bundle exec rake spec:${{ matrix.suite }}
+      - name: coverage upload ${{ matrix.suite }}
+        uses: codacy/codacy-coverage-reporter-action@master
+        if: github.ref == 'refs/heads/master'
+        with:
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          coverage-reports: coverage/coverage.xml

.github/workflows/spec.yml

@@ -2,21 +2,21 @@ name: Specs
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:
   linters:
     runs-on: ubuntu-latest
-    env:
-      OSEM_RUBY_VERSION: 2.5.9
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 3.1.2
           bundler-cache: true
       - run: bundle exec rubocop
       - run: bundle exec haml-lint app/views
@@ -26,7 +26,6 @@ jobs:
     name: spec
     env:
       OSEM_DB_ADAPTER: sqlite3
-      OSEM_RUBY_VERSION: 2.5.9
       RAILS_ENV: test
     strategy:
       matrix:
@@ -35,13 +34,14 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 3.1.2
           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
+          bundle exec rake factory_bot:lint RAILS_ENV=test
       - name: spec/${{ matrix.suite }}
         run: bundle exec rake spec:${{ matrix.suite }}
       - name: coverage upload ${{ matrix.suite }}

.gitignore

@@ -40,3 +40,5 @@ docker-compose.override.yml
 .buildconfig
 osem_development
 osem_test
+.ackrc
+spec/support/deprecation_shitlist.json