Merge branch 'main' into rss-feed

.github/workflows/ci.yml

@@ -39,3 +39,40 @@ jobs:
 
       - name: erb-lint Check
         run: bundle exec erblint --lint-all
+  test:
+    runs-on: ubuntu-latest
+    env:
+      RAILS_ENV: test
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: default
+          bundler-cache: true
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Build assets
+        run: bin/vite build --clear --mode=test
+
+      - name: Prepare database
+        run: |
+          bin/rails db:create
+          bin/rails db:schema:load
+
+      - name: Run tests
+        run: |
+          bin/rails test
+          bin/rails test:system
+
+      # - name: Smoke test database seeds
+      #   run: sudo bin/rails db:reset

.gitignore

@@ -35,7 +35,7 @@
 
 /node_modules
 
-/script
+/script_tmp
 .env
 .byebug_history
 
@@ -45,9 +45,15 @@
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
 
-/data.ms
+/data.ms*
 /data_tmp
+/data_preparation/**/*
+!/data_preparation/organisations.yml
 
 /config/credentials/production.key
 
 test-run-report*
+
+# Ignore SQLite databases create by Litestack for action cable to be removed once we are able to move them to storage
+db/*.db
+db/*.db-*

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.2.0"
 
 # Use main development branch of Rails
-gem "rails", github: "rails/rails", branch: "main"
+gem "rails", "~> 7.1.0"
 
 # The modern asset pipeline for Rails [https://github.com/rails/propshaft]
 gem "propshaft"
@@ -28,7 +28,7 @@ gem "turbo-rails"
 # gem "cssbundling-rails"
 
 # Use Redis adapter to run Action Cable in production
-gem "redis", ">= 4.0.1"
+# gem "redis", ">= 4.0.1"
 
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
 # gem "kredis"
@@ -58,13 +58,14 @@ group :development do
   gem "web-console"
 
   # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
-  # gem "rack-mini-profiler"
+  gem "rack-mini-profiler"
 
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
 
   gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
-  gem "ruby-lsp", "~> 0.5.1", require: false
+  gem "ruby-lsp", require: false
+  gem "ruby-lsp-rails", require: false
   gem "standardrb", "~> 1.0"
   gem "erb_lint", "~> 0.4.0"
   gem "authentication-zero", "~> 2.16"
@@ -73,15 +74,16 @@ end
 group :test do
   # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
   gem "capybara"
+  gem "rails-controller-testing"
   gem "selenium-webdriver"
-  gem "webdrivers"
   gem "vcr", "~> 6.1"
   gem "webmock"
 end
 
 gem "pagy", "~> 6.0"
 gem "dockerfile-rails", ">= 1.2", group: :development
-gem "litestack", "~> 0.2.3"
+gem "litestack"
+# gem "litestack", git: "[email protected]:oldmoe/litestack.git", branch: "master"
 gem "inline_svg", "~> 1.9"
 gem "net-http", "~> 0.3.2"
 gem "meilisearch-rails", "~> 0.9.1"
@@ -92,3 +94,5 @@ gem "meta-tags", "~> 2.18"
 gem "groupdate", "~> 6.2"
 
 gem "appsignal", "~> 3.4"
+
+gem "chartkick", "~> 5.0"