Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEATURE BRANCH - 407 Add SSO #498

Open
wants to merge 15 commits into
base: qa
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,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 tests in parallel
- run:
Expand Down
25 changes: 0 additions & 25 deletions .dockerignore

This file was deleted.

13 changes: 3 additions & 10 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password

# Mail Variables
[email protected]
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password

# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
Expand All @@ -15,7 +12,3 @@
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true

Mailer settings
[email protected]
TREATMENT_PRODUCTION_MAILER_URL=localhost
16 changes: 0 additions & 16 deletions .env.development.docker

This file was deleted.

29 changes: 13 additions & 16 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password

# Mail Variables
[email protected]

# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
TREATMENT_DATABASE_HOST=
TREATMENT_DATABASE_NAME=db/test.sqlite3
TREATMENT_DATABASE_PASSWORD=
TREATMENT_DATABASE_POOL=5
TREATMENT_DATABASE_PORT=
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true
# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
TREATMENT_DATABASE_HOST=
TREATMENT_DATABASE_NAME=db/test.sqlite3
TREATMENT_DATABASE_PASSWORD=
TREATMENT_DATABASE_POOL=5
TREATMENT_DATABASE_PORT=
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--require spec_helper
--require rails_helper
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ Metrics/ClassLength:
Exclude:
- 'app/controllers/conservation_records_controller.rb'

Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/users/registrations_controller.rb'

Metrics/AbcSize:
Exclude:
- 'app/helpers/in_house_repair_records_helper.rb'
Expand Down
19 changes: 12 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ ruby '3.3.3'
gem 'dotenv-rails' # Loads environment variables from .env

# Core Rails gems
gem 'actionmailer', '~>6.1.7.9' # Email composition, delivery, and receiving with Action Mailer
gem 'actionpack', '~>6.1.7.9' # Handles web requests and responses with Action Controller and Action Dispatch
gem 'actiontext', '~>6.1.7.9' # Rich text content and editing with Action Text
gem 'actionmailer', '~>6.1.7.10' # Email composition, delivery, and receiving with Action Mailer
gem 'actionpack', '~>6.1.7.10' # Handles web requests and responses with Action Controller and Action Dispatch
gem 'actiontext', '~>6.1.7.10' # Rich text content and editing with Action Text
gem 'activestorage' # Handles file uploads in Rails applications
gem 'builder' # Provides a simple way to create XML markup and data structures
gem 'mutex_m' # Being removed from Ruby soon, required for activestorage
gem 'rails', '~> 6.1.7.9' # The Rails framework
gem 'rails', '~> 6.1.7.10' # The Rails framework
gem 'sprockets-rails', '~> 3.4' # Sprockets adapter for Rails, needed for deploy:assets:precompile steps
gem 'sqlite3', '~> 1.4' # SQLite3 database adapter for ActiveRecord

Expand All @@ -41,12 +42,12 @@ gem 'sassc-rails', '~> 2.1' # SASSC adapter for Rails, needed for Bootstrap 5
gem 'turbolinks', '~> 5' # Makes navigating your site faster by using AJAX to load only the HTML needed

# Authentication and Authorization
gem 'bcrypt', '~> 3.1.7' # A Ruby binding for the OpenBSD bcrypt() password hashing algorithm
gem 'cancancan' # Authorization library for Ruby on Rails which restricts what resources a given user is allowed to access
gem 'devise' # Flexible authentication solution for Rails with Warden

# Additional Functionality
gem 'nokogiri' # HTML, XML, SAX, and Reader parser
gem 'pagy' # Pagination library that is fast, lightweight, and flexible
gem 'pagy', '~> 9.0' # Pagination library that is fast, lightweight, and flexible
gem 'paper_trail' # Track changes to your models' data
gem 'pdfkit' # Uses wkhtmltopdf to generate PDFs from HTML
gem 'rexml', '>= 3.3.6' # XML processing library, now a direct dependency for security management
Expand All @@ -55,6 +56,8 @@ gem 'wkhtmltopdf-binary', '>= 0.12.6.7' # Enables PDF generation from HTML
# Windows specific timezone data
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] # Timezone data for Windows

gem 'show_me_the_cookies' # Cookie inspection for tests

group :development, :test do
# Debugging tools
gem 'byebug', platforms: %i[mri mingw x64_mingw] # Debugging tool for Ruby
Expand All @@ -63,7 +66,6 @@ group :development, :test do
gem 'factory_bot_rails' # A fixtures replacement with a straightforward definition syntax
gem 'rails-controller-testing' # Adds missing helper methods for controller tests in Rails 5
gem 'rspec_junit_formatter' # Outputs RSpec results in JUnit format
gem 'rspec-rails', '~> 6.0.0' # RSpec for Rails 6+
gem 'selenium-webdriver', '~> 4.18.1' # WebDriver for testing web applications

# Coverage and code analysis
Expand Down Expand Up @@ -100,6 +102,9 @@ group :test do
gem 'capybara', '>= 2.15' # Integration testing tool for rack-based web applications
gem 'database_cleaner-active_record' # Strategies for cleaning databases in Ruby
gem 'launchy' # Opens a given URL in a browser
gem 'rack-test' # Small, simple testing API for Rack apps
gem 'rspec-rails', '~> 6.0.0' # RSpec for Rails 6+
gem 'shoulda-matchers', '~> 5.0' # Provides RSpec with additional matchers
end

group :production do
Expand Down
Loading