WIP - FEATURE BRANCH - 214 - Refactor Feature Testing

.circleci/config.yml

@@ -90,8 +90,9 @@ jobs:
           key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
       # Database setup
-      - run: bundle exec rake db:create
-      - run: bundle exec rake db:schema:load
+      - run: bundle exec rails db:create
+      - run: bundle exec rails db:schema:load
+      - run: bundle exec rails db:seed
 
       - run:
           name: Rubocop

.env.development

@@ -1,6 +1,6 @@
-# Admin Variables
- ADMIN_USERNAME=test
- ADMIN_PASSWORD=password
+  # Admin Variables
+  ADMIN_USERNAME=test
+  ADMIN_PASSWORD=password
 
   # Mail Variables
   [email protected]
@@ -15,6 +15,6 @@
   TREATMENT_DATABASE_TIMEOUT=5000
   TREATMENT_DATABASE_USERNAME=
 
-  Mailer settings
+  # Mailer settings
   [email protected]
   TREATMENT_PRODUCTION_MAILER_URL=localhost

.env.test

@@ -13,4 +13,4 @@
  TREATMENT_DATABASE_POOL=5
  TREATMENT_DATABASE_PORT=
  TREATMENT_DATABASE_TIMEOUT=5000
- TREATMENT_DATABASE_USERNAME=
+ TREATMENT_DATABASE_USERNAME=

Gemfile

@@ -73,6 +73,7 @@ group :development, :test do
   gem 'database_cleaner'
   gem 'ed25519'
   gem 'factory_bot_rails'
+  gem 'launchy'
   gem 'rspec_junit_formatter'
   gem 'rspec-rails', '~> 4.1.0'
   gem 'rubocop-rails'

Gemfile.lock

@@ -60,8 +60,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     airbrussh (1.5.2)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.2)
@@ -81,7 +81,7 @@ GEM
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
     brakeman (5.4.1)
-    builder (3.2.4)
+    builder (3.3.0)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -109,7 +109,8 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    concurrent-ruby (1.3.1)
+    childprocess (5.0.0)
+    concurrent-ruby (1.3.3)
     coveralls_reborn (0.28.0)
       simplecov (~> 0.22.0)
       term-ansicolor (~> 1.7)
@@ -136,19 +137,23 @@ GEM
       dotenv (= 3.1.2)
       railties (>= 6.1)
     ed25519 (1.3.0)
-    erubi (1.12.0)
+    erubi (1.13.0)
     execjs (2.9.1)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
     ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.5)
@@ -162,6 +167,9 @@ GEM
       thor (>= 0.14, < 2.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    launchy (3.0.1)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -177,11 +185,12 @@ GEM
     matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.1)
+    mize (0.4.1)
+      protocol (~> 2.0)
     msgpack (1.7.2)
-    mutex_m (0.2.0)
     mysql2 (0.5.6)
-    net-imap (0.4.12)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -196,30 +205,32 @@ GEM
       net-protocol
     net-ssh (7.2.3)
     nio4r (2.7.3)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.6-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.16.6-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.16.6-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (8.4.4)
+    pagy (8.6.2)
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pdfkit (0.8.7.3)
     popper_js (1.16.1)
-    public_suffix (5.0.5)
+    protocol (2.0.0)
+      ruby_parser (~> 3.0)
+    public_suffix (6.0.0)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.8.0)
@@ -270,11 +281,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.1)
+      strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -304,12 +315,15 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
+    ruby_parser (3.21.0)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
     rubyzip (2.3.2)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -326,6 +340,7 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    sexp_processor (4.17.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -340,7 +355,7 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.0)
+    sprockets-rails (3.5.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
@@ -350,18 +365,18 @@ GEM
     sqlite3 (1.7.3-x86-linux)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
-    sshkit (1.22.2)
+    sshkit (1.23.0)
       base64
-      mutex_m
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     strscan (3.1.0)
     sync (0.5.0)
-    term-ansicolor (1.8.0)
+    term-ansicolor (1.10.2)
+      mize
       tins (~> 1.0)
     thor (1.3.1)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
     tins (1.33.0)
       bigdecimal
@@ -388,15 +403,23 @@ GEM
     wkhtmltopdf-binary (0.12.6.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
   arm-linux
+  arm-linux-gnu
+  arm-linux-musl
   arm64-darwin
   x86-linux
+  x86-linux-gnu
+  x86-linux-musl
   x86_64-darwin
   x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   activestorage (>= 5.2.6.3)
@@ -421,6 +444,7 @@ DEPENDENCIES
   factory_bot_rails
   jbuilder (~> 2.5)
   jquery-rails
+  launchy
   mysql2
   nokogiri
   pagy
@@ -451,4 +475,4 @@ RUBY VERSION
    ruby 3.3.1p55
 
 BUNDLED WITH
-   2.5.6
+   2.5.10

README.md

@@ -47,13 +47,9 @@ bundle install
 ```bash
 rails db:migrate
 rails db:seed
+rails db:seed # (Optional, for example works, accounts, and vocabularies)
 rails server
-rails db:seed # (Optional, for example works)
 ```
-### Important:
-Running the db:seed is not sufficient to populate the database with the necessary data. You will need to import the data
-for the controlled vocaublary and users.
-See [wiki](https://github.com/uclibs/treatment_database/wiki/Migration) for migration steps.
 
 ## Running the Tests
 

app/controllers/users_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class UsersController < ApplicationController
+  before_action :authenticate_user!
+
   load_and_authorize_resource
 
   def index

app/views/treatment_reports/_abbreviated_treatment_report_form.html.erb

@@ -8,7 +8,6 @@
       <p>
         <%= f.text_area :abbreviated_treatment_report, class: 'form-control' %>
       </p>
-
       <p>
         <%= f.submit 'Save Abbreviated Treatment Report', class: 'btn btn-primary' %>
     </div>