Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2399 commits
Select commit Hold shift + click to select a range
5de620a
Fixed dropdown overflow issue in bootstrap tables
benjaminfaure Apr 12, 2023
ebf8ee8
fix issue with dropdown menu overflow against table - thanks @bfaure
briri Apr 12, 2023
56803ed
updated CHANGELOG
briri Apr 12, 2023
4a051ca
fixed issue with button color contrasts
briri Apr 12, 2023
8d0b1a4
fixed rubocop
briri Apr 12, 2023
bfd58c8
Merge branch 'development' into tinymce-v6
briri Apr 12, 2023
04a7425
Merge pull request #3308 from DMPRoadmap/tinymce-v6
briri Apr 12, 2023
cfb32f7
pulled down latest from Translation.io
briri Apr 12, 2023
ad6d9a0
Merge branch 'translations' of github.com:DMPRoadmap/roadmap into tra…
briri Apr 12, 2023
84e0a43
Merge pull request #3307 from DMPRoadmap/translations
briri Apr 12, 2023
69141d9
updated dependencies
briri Apr 12, 2023
4df85c7
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Apr 12, 2023
5c893ad
Merge branch 'development' into add_error_message
briri Apr 12, 2023
6dd914a
fix issue with usage page and tinymce on template customization for R…
briri Apr 13, 2023
7d9a1d5
Merge pull request #3309 from DMPRoadmap/development
briri Apr 13, 2023
0cdd9f4
Update README.md
briri Apr 13, 2023
e4f8830
added .gitkeep file to assets/builds to address issues in production …
briri May 1, 2023
d7d64e6
Merge pull request #3312 from DMPRoadmap/main
briri May 1, 2023
927e885
added note to CHANGELOG
briri May 1, 2023
9b73b34
Merge branch 'development' into cssbundling-deploy-fix
briri May 1, 2023
1c7a126
Solved issue where spring was loaded in production mode
benjaminfaure Jun 14, 2023
df693dc
Updated CHANGELOG
benjaminfaure Jun 14, 2023
b2d55c6
fix typo, probably introduced by v1 code
nicolasfranck Jul 13, 2023
b0cbb37
Updated fontawesome to V6
benjaminfaure Jul 18, 2023
76c53a5
Added JS constants to be used in the Research Outputs feature
gjacob24 Aug 4, 2023
488072a
Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
don-stuckey Sep 15, 2023
06bd855
Added entry to in Fixed section for this change.
don-stuckey Sep 15, 2023
5d1281b
Moved the fixed-entry for this issue to the top the CHANGELOG.md file.
don-stuckey Sep 18, 2023
7d163b0
update CHANGELOG.md as requested by closed PR https://github.com/DMPR…
nicolasfranck Sep 18, 2023
3e417e2
Updated missing icons to fontawesome v6
benjaminfaure Oct 16, 2023
05a5223
Merge pull request #3339 from DMPRoadmap/issue_3337_default_font_down…
martaribeiro Oct 16, 2023
fbcd2c9
Merge branch 'development' into add_js_constants_for_research_outputs
martaribeiro Oct 16, 2023
a9e5d8b
Merge pull request #3334 from DMPRoadmap/add_js_constants_for_researc…
martaribeiro Oct 16, 2023
78e7349
Merge branch 'development' into fontawesome-v6
martaribeiro Oct 16, 2023
292019e
Merge pull request #3329 from DMPRoadmap/fontawesome-v6
martaribeiro Oct 16, 2023
a0980f4
Merge branch 'development' into main
martaribeiro Oct 16, 2023
83ad549
Merge pull request #3325 from nicolasfranck/main
martaribeiro Oct 16, 2023
79a8384
Merge branch 'development' into issue3316
martaribeiro Oct 16, 2023
c1b3e54
Merge pull request #3320 from DMPRoadmap/issue3316
martaribeiro Oct 16, 2023
db6ac9b
Merge branch 'development' into cssbundling-deploy-fix
martaribeiro Oct 16, 2023
ebe76db
Merge pull request #3314 from DMPRoadmap/cssbundling-deploy-fix
martaribeiro Oct 16, 2023
64eef3a
Merge branch 'development' into add_error_message
martaribeiro Oct 16, 2023
9ab03b7
Merge pull request #3232 from DMPRoadmap/add_error_message
martaribeiro Oct 16, 2023
6ed6960
Update Gemfile.lock and yarn.lock
Oct 16, 2023
3652114
Merge pull request #3351 from DMPRoadmap/4.1.1-gem-and-yarn
martaribeiro Oct 16, 2023
c375492
Revert "Update Gemfile.lock and yarn.lock"
martaribeiro Oct 16, 2023
a644ed2
Merge pull request #3352 from DMPRoadmap/revert-3351-4.1.1-gem-and-yarn
martaribeiro Oct 16, 2023
dd6cba3
Update tp gems.
Oct 16, 2023
ba149a0
Merge pull request #3353 from DMPRoadmap/4.1.1-bundle-update
martaribeiro Oct 16, 2023
8a0d0fb
Merge pull request #3354 from DMPRoadmap/development
martaribeiro Oct 16, 2023
518b97a
Rubocop fix after v4.1.1
gjacob24 Nov 13, 2023
932e31e
Issue #3144 - Upgrade to Bootstrap 5
gjacob24 Oct 27, 2023
df75226
Use selenium-webdriver gem / Remove webdrivers
aaronskiba Jan 30, 2024
e0c62da
Don't limit sign-in attempts on test environment
aaronskiba Jan 30, 2024
de5afd5
replace 'safe_email' with 'email' for Faker
aaronskiba Jan 30, 2024
d89c897
Small tweaks to fix existing tests
aaronskiba Jan 30, 2024
b1b38ec
Remove duplicate `node-version:` from workflows
aaronskiba Jan 31, 2024
620674d
Minor fix for Copy link modal
gjacob24 Feb 6, 2024
1d35aec
Make rubocop happy
aaronskiba Feb 7, 2024
b7b09d2
Fix for issue 2. raised by Aaron.
gjacob24 Mar 13, 2024
bd7bfc5
IssueID #3144 - Rspec fixes for Bootstrap 5 upgrade:
Mar 14, 2024
7565cb6
Merge pull request #3359 from DMPRoadmap/rubocop_fixes
martaribeiro Mar 25, 2024
6ec87f5
Merge pull request #3376 from DMPRoadmap/aaron/fix-rspec-tests
martaribeiro Mar 25, 2024
3304792
Merge branch 'development' into issue_3144_upgrade_to_bootstrap_5
martaribeiro Mar 25, 2024
07c2082
Update modal_search_spec.rb
martaribeiro Mar 25, 2024
da4033b
Issue #3144 - Upgrade to Bootstrap 5
gjacob24 Oct 27, 2023
d6b2db6
Minor fix for Copy link modal
gjacob24 Feb 6, 2024
cb9b344
Fix for issue 2. raised by Aaron.
gjacob24 Mar 13, 2024
11a7ec8
IssueID #3144 - Rspec fixes for Bootstrap 5 upgrade:
Mar 14, 2024
b90ffcd
Update modal_search_spec.rb
martaribeiro Mar 25, 2024
84533cf
Merge branch 'issue_3144_upgrade_to_bootstrap_5' of github-as-johnpin…
Mar 25, 2024
6785bf3
Changes in this PR:
gjacob24 Mar 26, 2024
d96561c
Changes in this PR:
gjacob24 Apr 8, 2024
687fb08
Merge pull request #3374 from DMPRoadmap/issue_3144_upgrade_to_bootst…
benjaminfaure Apr 8, 2024
7312151
Call getConstant() after constants.js callback
aaronskiba Jan 15, 2024
83f16f8
Put back constant for passwordHelper.js
aaronskiba Jan 15, 2024
831d6d3
Update CHANGELOG.md
aaronskiba Mar 27, 2024
7bef45f
Merge pull request #3364 from DMPRoadmap/aaron/issues/3361
gjacob24 Apr 8, 2024
2d69584
Prevent duplicate options in 'Select Guidance'
aaronskiba Jan 15, 2024
7d04741
refactor / make rubocop happy
aaronskiba Jan 15, 2024
a3676ab
Add Changelog entries for PR #3365 and #3376
aaronskiba Mar 26, 2024
5f5795e
Merge pull request #3365 from DMPRoadmap/aaron/issues/3343
benjaminfaure Apr 9, 2024
b1cf120
Bumped bootstrap to 5.3 & updated JS dependencies
benjaminfaure Apr 9, 2024
03365f4
Added net-stmp & updated Gems
benjaminfaure Apr 9, 2024
c5df391
Made rubocop happy
benjaminfaure Apr 9, 2024
0f805f6
Upgrade github actions node version to 18
benjaminfaure Apr 9, 2024
55321d0
Fix for failing Rubocop tests.
Apr 9, 2024
708dee4
Increase window-size for headless features tests
aaronskiba Feb 8, 2024
56759df
Merge pull request #3405 from DMPRoadmap/fix_rspec_tests_for_bootstra…
benjaminfaure Apr 11, 2024
fc047ac
Merge pull request #3403 from DMPRoadmap/development
benjaminfaure Apr 11, 2024
6f7ce4c
Updated app to rails 7
benjaminfaure Jun 13, 2024
bda5b6e
Made rubocop happy
benjaminfaure Jun 14, 2024
0e544e4
Edit "Setup Credentials" step within workflows
aaronskiba Jul 6, 2024
5801e7f
Edit copy of credentials file within `bin/setup`
aaronskiba Jul 6, 2024
727c2e8
Disable Spring during workflows/ db build
aaronskiba Jul 8, 2024
1fe50c4
Undo Rubocop `Style/SymbolProc`-related fixes
aaronskiba Jul 8, 2024
283e585
Make Rubocop happy
aaronskiba Jul 9, 2024
595e013
Fix breaking template.visibilty tests
aaronskiba Jul 10, 2024
15e4d4d
Refactor template.visibility w/ Rails enum method
aaronskiba Jul 10, 2024
4bd0e9a
Fix `template.visibilty` checkbox behaviour
aaronskiba Jul 10, 2024
d06f436
Fix handling of JSON payload in API auth tests
aaronskiba Jul 15, 2024
5d06d6b
Fix `@rails/ujs` init / use ES6 module syntax
aaronskiba Jul 18, 2024
bfa2ae3
Bullet fixes for `/super_admin/api_clients`
aaronskiba Jul 23, 2024
935433c
Bullet fixes for `/public_plans`
aaronskiba Jul 23, 2024
a079c57
Bullet fixes for `/org_admin/plans` (superuser)
aaronskiba Jul 23, 2024
a07d344
Make Rubocop happy
aaronskiba Jul 23, 2024
36e5b7d
Fix for bug in Plan duplication results in original plan identifier b…
Jul 29, 2024
20b5e14
Fix for bug in Plan duplication results in original plan identifier b…
Jul 30, 2024
76cbb2b
Fix for #3443 - bar chart click function broken in usage dashboard
gjacob24 Jul 31, 2024
8f18468
Added entry in CHANGELOG.md
gjacob24 Jul 31, 2024
d2a1eac
Merge pull request #3435 from DMPRoadmap/aaron/rails7-copy
aaronskiba Aug 19, 2024
a670f5e
Fix "pass class as a kwarg" deprecation warnings
aaronskiba Aug 20, 2024
68af924
Fix `action_dispatch` deprecation warning
aaronskiba Aug 20, 2024
10852d4
Removed eslint disable for no-underscore-dangle
gjacob24 Aug 21, 2024
ae27a0d
Fix flaky tests / optimize checking of page title
aaronskiba Aug 29, 2024
f25763c
Merge pull request #3449 from DMPRoadmap/aaron/rails7-copy
aaronskiba Sep 5, 2024
48b7c68
Pinned Rails JS dependencies to 7.1 & updated dependencies
benjaminfaure Sep 10, 2024
c24a776
Make Rubocop happy
aaronskiba Oct 31, 2024
1b34730
Merge pull request #3426 from DMPRoadmap/rails7
benjaminfaure Nov 18, 2024
03389e8
Merge branch 'development' into aaron/issues/3450
benjaminfaure Nov 18, 2024
0f263f7
Merge pull request #3451 from DMPRoadmap/aaron/issues/3450
benjaminfaure Nov 18, 2024
96a4f59
Merge pull request #3444 from DMPRoadmap/issue_3443_usage_dashboard_b…
benjaminfaure Nov 18, 2024
747acf2
Merge branch 'development' into plan-deep-copy-bug-copies-old-id-as-i…
benjaminfaure Nov 18, 2024
994bb60
Merge pull request #3441 from DMPRoadmap/plan-deep-copy-bug-copies-ol…
benjaminfaure Nov 18, 2024
4b25e4a
Refactor deep_copy: Remove redundant `plan.save!`
aaronskiba Dec 11, 2024
d8f8978
Refactor / use ActiveRecord association operator
aaronskiba Dec 11, 2024
521ba8e
Add test for plan identifier copying
aaronskiba Dec 11, 2024
d6687c8
Merge branch 'development' into aaron/bullet-fixes
aaronskiba Dec 11, 2024
a5f5b53
Merge pull request #3440 from DMPRoadmap/aaron/bullet-fixes
aaronskiba Dec 11, 2024
98ac61c
Merge branch 'development' into aaron/refactor-plan-deep-copy
johnpinto1 Dec 13, 2024
f0a3ecf
Update CHANGELOG.md
aaronskiba Dec 16, 2024
2d707d5
Merge pull request #3469 from DMPRoadmap/aaron/refactor-plan-deep-copy
aaronskiba Dec 16, 2024
90a4809
The V1 API docs link in Edit profile > API access tab was broken.
Dec 16, 2024
d9279dc
Merge pull request #3470 from DMPRoadmap/fix-for-broken-v1-api-doc-link
aaronskiba Jan 27, 2025
434074a
Add feature test for research_output associations
aaronskiba Feb 13, 2025
b417f28
Fix `hidden_field_tag` params for Rails 7 upgrade
aaronskiba Feb 13, 2025
527c347
Update CHANGELOG.md
aaronskiba Feb 13, 2025
8a7d832
Fix GH Action test: `data-bs-dismiss` modal close
aaronskiba Feb 13, 2025
a025258
Merge pull request #3479 from portagenetwork/aaron/upstream/issues/3478
aaronskiba Mar 12, 2025
8982664
Add pdf handling in render_respond_to_format_with_error_message
aaronskiba Apr 19, 2024
7bf3d29
Update CHANGELOG.md
aaronskiba Mar 14, 2025
b1d1e63
Update all workflows to `runs-on: ubuntu-22.04`
aaronskiba Mar 17, 2025
8481661
Update CHANGELOG.md
aaronskiba Mar 17, 2025
627a47f
Extract full semvers in Danger workflow
aaronskiba Mar 17, 2025
46389a1
Replace deprecated `setup-ruby` action
aaronskiba Mar 17, 2025
748a94f
TEMP: Lower Chrome Version for Postgres GH Action
aaronskiba Mar 20, 2025
fb2d871
Refactor `spec/features/modal_search_spec.rb`
aaronskiba Mar 20, 2025
383a2f0
Refactor to make rubocop happy
aaronskiba Mar 20, 2025
cd3f480
Update CHANGELOG.md
aaronskiba Mar 20, 2025
6a49bd6
Merge pull request #3491 from DMPRoadmap/aaron/issues/downgrade-chrome
aaronskiba Mar 24, 2025
65253e0
Merge branch 'development' into aaron/issues/3414
aaronskiba Mar 24, 2025
097372c
Merge pull request #3482 from DMPRoadmap/aaron/issues/3414
aaronskiba Mar 24, 2025
bdf3d6d
`bundle update && yarn upgrade`
aaronskiba Mar 14, 2025
cc7e00f
Migrate to RuboCop extensions using plugins
aaronskiba Mar 14, 2025
7169ea1
`rubocop -A`
aaronskiba Mar 14, 2025
d738fd9
Make rubocop happy
aaronskiba Mar 14, 2025
61171b3
yarn add --dev @babel/plugin-syntax-dynamic-import
aaronskiba Mar 14, 2025
b20e952
Refactor handling of ENV vars in postgres workflow
aaronskiba Mar 14, 2025
0e3df33
Update CHANGELOG.md
aaronskiba Mar 24, 2025
ebb34ef
Merge branch 'development' into aaron/issues/3484
aaronskiba Mar 24, 2025
c303871
Update all workflows to `runs-on: ubuntu-24.04`
aaronskiba Mar 24, 2025
027fa4a
Install `imagemagick` in Postgres Workflow
aaronskiba Mar 24, 2025
c7b9b48
Consolidate Capybara config
aaronskiba Mar 24, 2025
41b9169
Update CHANGELOG.md
aaronskiba Mar 24, 2025
141e7cf
Merge pull request #3487 from DMPRoadmap/aaron/issues/3484
aaronskiba Mar 25, 2025
d59ff79
Merge branch 'development' into aaron/bundler-update-yarn-upgrade
aaronskiba Mar 25, 2025
5ebffd6
Revert "yarn add --dev @babel/plugin-syntax-dynamic-import"
aaronskiba Mar 25, 2025
bcda450
Remove redundant plugin from `babel.config.js`
aaronskiba Mar 25, 2025
ad67842
Merge pull request #3483 from DMPRoadmap/aaron/bundler-update-yarn-up…
aaronskiba Mar 26, 2025
9c7bd73
Add missing CHANGELOG entries
aaronskiba Mar 26, 2025
d669ac5
Add `coder :YAML` to `serialize` for Rails 7.1
aaronskiba Mar 26, 2025
f26b54f
Match `config.load_defaults` to Rails (v7.1)
aaronskiba Mar 26, 2025
76cc7eb
Update CHANGELOG.md
aaronskiba Mar 26, 2025
c5fd8af
Fix issues with Conditional question serialization (offered by @briri
Mar 27, 2025
7ffc815
`bin/rails db:migrate`
aaronskiba Mar 27, 2025
da93d72
Fix for Conditional model bug for the webhook_data which was typed as a
Apr 2, 2025
dba3999
Updated the comment for param_conditions parameter for method
Apr 3, 2025
a58017c
Updated the check (!conditions.nil? && conditions.any?) in tag
Apr 3, 2025
1226803
Remove unused `serialize :prefs` from User model
aaronskiba Apr 3, 2025
06b0db5
Updated the tag in app/views/org_admin/conditions/_form.html.erb
Apr 4, 2025
739aad0
Refactor mapping of `remove_data` & `option_list`
aaronskiba Apr 4, 2025
f6a232b
Refactor webhook_data validation and construction
aaronskiba Apr 4, 2025
82984e2
Refactor handling of `c.option_list.empty?`
aaronskiba Apr 4, 2025
49b9f7d
Refactor option_list and remove_data handling
aaronskiba Apr 4, 2025
115ea70
Put back `# rubocop:disable Metrics/MethodLength`
aaronskiba Apr 4, 2025
0fde253
Update CHANGELOG.md
aaronskiba Apr 7, 2025
0c2e2d2
Document callers of conditions/form partial
aaronskiba Apr 7, 2025
c879520
Merge pull request #3501 from DMPRoadmap/aaron/refactor-question-save…
aaronskiba Apr 7, 2025
97677d4
Remove commented-out code
aaronskiba Apr 7, 2025
c7abc11
Remove unused variable from conditions/form
aaronskiba Apr 7, 2025
b2eaac4
Replace `condition_exists` w/ `condition.present?`
aaronskiba Apr 7, 2025
e651186
Remove redundant `type_default` variable
aaronskiba Apr 7, 2025
dc04625
Remove redundant conditional check
aaronskiba Apr 7, 2025
5d0ec1e
Remove redundant conditional check
aaronskiba Apr 8, 2025
3a11067
Refactor: Split conditions/_form into two
aaronskiba Apr 8, 2025
4724bc7
Cleanup after `condtions/_form` refactor
aaronskiba Apr 8, 2025
8f952be
Update CHANGELOG.md
aaronskiba Apr 9, 2025
ae5786e
Merge branch 'johnpinto1-updated-port-of-dmptool-conditional-question…
aaronskiba Apr 9, 2025
478fdad
Merge pull request #3502 from DMPRoadmap/aaron/refactor-conditions-form
aaronskiba Apr 9, 2025
c0f6981
Enable translations with gettext method
aaronskiba Apr 9, 2025
9572e01
Merge pull request #3497 from DMPRoadmap/johnpinto1-updated-port-of-d…
aaronskiba Apr 9, 2025
325b49f
Merge branch 'development' into aaron/config.load_defaults-7.1
aaronskiba Apr 9, 2025
3506e05
Merge pull request #3496 from DMPRoadmap/aaron/config.load_defaults-7.1
aaronskiba Apr 10, 2025
6ec8ba0
Merge pull request #3495 from DMPRoadmap/development
aaronskiba Apr 10, 2025
6f15ec3
Bump tinymce from 6.8.5 to 7.2.0
dependabot[bot] Apr 10, 2025
c1fe906
Set licence_key in TinyMCE config
aaronskiba Jun 13, 2024
fdecea8
Update CHANGELOG.md
aaronskiba Apr 10, 2025
d8b6bab
Merge pull request #3505 from DMPRoadmap/dependabot/npm_and_yarn/tiny…
aaronskiba Apr 10, 2025
885bc22
Update README.md
aaronskiba Apr 10, 2025
43a3997
Update translation files for upcoming release
aaronskiba Apr 10, 2025
1968be9
Update CHANGELOG.md
aaronskiba Apr 11, 2025
e5fc72b
Merge pull request #3506 from DMPRoadmap/main
aaronskiba Apr 14, 2025
7e0e9b2
Fix failing eslint workflow / upgrade to v3
aaronskiba Apr 8, 2025
d30f7be
Update CHANGELOG.md
aaronskiba Apr 8, 2025
36ef21c
Merge pull request #3503 from DMPRoadmap/aaron/fix-eslint-workflow
johnpinto1 Apr 24, 2025
ab5ba17
Fix rendering of `confirm_merge` partial
aaronskiba Apr 23, 2025
989e3ea
Update CHANGELOG.md
aaronskiba Apr 24, 2025
4bbaa34
Merge pull request #3515 from DMPRoadmap/aaron/fix-confirm-merge-partial
johnpinto1 Apr 24, 2025
9a9a340
Remove auto-generated TinyMCE files
aaronskiba Oct 31, 2024
f1d57cd
Add `public/tinymce/skins/` to `.gitignore`
aaronskiba Oct 31, 2024
4e75f32
Update CHANGELOG.md
aaronskiba Apr 25, 2025
3b44ec0
Merge pull request #3466 from DMPRoadmap/tinymce-cleanup
aaronskiba Apr 25, 2025
e97cab7
Add border and arrow for dropdown fields.
Apr 15, 2025
36ba6aa
Adjust layout of dropdown and fieldset elements in download page.
May 1, 2025
3246659
Additional `form-control` to `form-select` changes
aaronskiba Apr 24, 2025
72c2519
Improve styling consistency between headings
aaronskiba Apr 24, 2025
a5fd512
Merge pull request #3517 from DMPRoadmap/aaron/gjacob24-contribution-…
aaronskiba May 1, 2025
e6810fe
Merge branch 'development' into gjacob24-contribution-of-style-of-sel…
aaronskiba May 1, 2025
3277370
Fix accessibility and preserve aligned headings
aaronskiba May 1, 2025
4c1befb
Merge pull request #3509 from DMPRoadmap/gjacob24-contribution-of-sty…
johnpinto1 May 2, 2025
485a16a
Updated seeds.rb file for identifier_schemes to include context value…
May 12, 2025
cbb6dad
Merge pull request #3525 from DMPRoadmap/dstuckey-dmponline-update-se…
johnpinto1 May 12, 2025
895a4c8
Add `:confirmable` to included devise modules
aaronskiba Sep 25, 2024
90e6445
Streamline email confirmation for existing users
aaronskiba Apr 16, 2025
dcbc524
Refactor SessionsController#create
aaronskiba Apr 16, 2025
7587466
Refactor SessionsController#create
aaronskiba Apr 16, 2025
638e179
Adapt existing tests to `:confirmable` re-addition
aaronskiba Oct 7, 2024
1ceeec0
Add email confirmation .yml translations
aaronskiba Sep 26, 2024
6f0924e
Streamline email confirmation for SSO sign-in
aaronskiba Apr 17, 2025
e1cdee9
Create EmailConfirmationHandler concern & refactor
aaronskiba Apr 17, 2025
cdfe8fd
Refactor `def handle_omniauth`
aaronskiba Apr 17, 2025
ffdfd56
Small formatting cleanup for omniauth controller
aaronskiba Apr 17, 2025
f934172
Disable rubocop offences
aaronskiba Apr 17, 2025
c3075f1
Enable OmniAuth testing in RSpec tests
aaronskiba Apr 22, 2025
47233c7
Add tests for custom email confirmation UX flow
aaronskiba Apr 22, 2025
ad899ae
Fix failing shibboleth test
aaronskiba Apr 22, 2025
b13e4ff
Use `I18n.default_locale` in faker config
aaronskiba Apr 15, 2025
b7d16c6
Update CHANGELOG.md
aaronskiba Apr 24, 2025
ab61ae0
Fix comments in Shibboleth test
aaronskiba Jun 5, 2025
2535269
Merge pull request #3507 from DMPRoadmap/upstream/aaron/add-email-con…
aaronskiba Jun 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 0 additions & 16 deletions .babelrc

This file was deleted.

4 changes: 4 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
defaults
> .25%
Firefox >= 52
IE >= 10
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true


# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,scss,rb,erb}]
charset = utf-8
indent_style = space
indent_size = 2
48 changes: 48 additions & 0 deletions .env.mysql2
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# DMPRoadmap dotenv file

# Rails log level
RAILS_LOG_LEVEL=debug
# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
RAILS_LOG_TO_STDOUT=true
# Whether or not Rails will be serving your static assets
RAILS_SERVE_STATIC_FILES=false
# Maximum number of Puma threads
RAILS_MAX_THREADS=5
# Maximum number of Puma workers
WEB_CONCURRENCY=2
# The port puma will use to host the Rails app
PORT=3000

# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
DMPROADMAP_HOST=localhost

# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
# `which wkhtmltopdf` on linux/osx systems.
WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf

# Database settings.
DB_ADAPTER=mysql2
DB_HOST=localhost
DB_PORT=3306
DB_POOL_SIZE=16
DB_NAME=roadmap

# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will
# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
DRAGONFLY_AWS=false
AWS_REGION=
AWS_BUCKET_NAME=

# If you have a Rollbar account and want to redcord errors there, add your token here
ROLLBAR_ACCESS_TOKEN=
ROLLBAR_ENV=

# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your
# customized content in ./app/views/branded and `app` is for the core roadmap translations.
# Include your Translation.io API key for the appropriate domains:
# app => TRANSLATION_API_ROADMAP
# client => TRANSLATION_API_CLIENT
# DOMAIN=app
# TRANSLATION_API_ROADMAP=
# TRANSLATION_API_CLIENT=
48 changes: 48 additions & 0 deletions .env.postgresql
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# DMPRoadmap dotenv file

# Rails log level
RAILS_LOG_LEVEL=debug
# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
RAILS_LOG_TO_STDOUT=true
# Whether or not Rails will be serving your static assets
RAILS_SERVE_STATIC_FILES=false
# Maximum number of Puma threads
RAILS_MAX_THREADS=5
# Maximum number of Puma workers
WEB_CONCURRENCY=2
# The port puma will use to host the Rails app
PORT=3000

# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
DMPROADMAP_HOST=localhost

# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
# `which wkhtmltopdf` on linux/osx systems.
WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf

# Database settings.
DB_ADAPTER=postgresql
DB_HOST=localhost
DB_PORT=5432
DB_POOL_SIZE=16
DB_NAME=roadmap

# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will
# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
DRAGONFLY_AWS=false
AWS_REGION=
AWS_BUCKET_NAME=

# If you have a Rollbar account and want to redcord errors there, add your token here
ROLLBAR_ACCESS_TOKEN=
ROLLBAR_ENV=

# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your
# customized content in ./app/views/branded and `app` is for the core roadmap translations.
# Include your Translation.io API key for the appropriate domains:
# app => TRANSLATION_API_ROADMAP
# client => TRANSLATION_API_CLIENT
DOMAIN=app
TRANSLATION_API_ROADMAP=
TRANSLATION_API_CLIENT=
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"spyOnEvent": true
},
"rules": {
"import/no-unresolved": "off",
"indent": [
"error",
2
Expand All @@ -39,4 +40,4 @@
"enforceForRenamedProperties": false
}]
}
}
}
File renamed without changes.
2 changes: 2 additions & 0 deletions ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Please complete the following fields as applicable:

**What version of the DMPRoadmap code are you running? (e.g. v2.2.0)**

**Expected behaviour:**

**Actual behaviour:**
Expand Down
File renamed without changes.
12 changes: 7 additions & 5 deletions .github/workflows/brakeman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ on:
jobs:
brakeman:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

# Will run Brakeman checks on dependencies
# https://github.com/marketplace/actions/brakeman-linter
# https://github.com/marketplace/actions/brakeman-action
- name: Brakeman
uses: devmasx/brakeman-linter-action@v1.0.0
uses: artplan1/brakeman-action@v1.2.1
with:
flags: "--color"
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Danger

on: [push, pull_request]

jobs:
danger:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3

- name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
run: |
echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`" >> $GITHUB_ENV
echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`" >> $GITHUB_ENV

# Install Ruby - using the version found in the Gemfile.lock
- name: 'Install Ruby'
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}

- name: 'Bundle Install'
run: |
gem install bundler -v ${{ env.BUNDLER_VERSION }}
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3 --without pgsql rollbar aws

- name: 'Run Danger'
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bundle exec danger
23 changes: 15 additions & 8 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
name: ESLint

on: [pull_request]
on: [push, pull_request]

jobs:
eslint:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v1
# Checkout the repo
- uses: actions/checkout@v3

# Will run ES Lint checks on javascript files
# https://github.com/marketplace/actions/run-eslint
- name: 'ES Lint checks'
uses: stefanoeb/eslint-action@1.0.0
# Install Node
- uses: actions/setup-node@v3
with:
args: './app/javascript/**/*.js'
cache: 'yarn'
node-version: 18

# Run yarn install for JS dependencies
- name: 'Yarn Install'
run: yarn install

- name: 'Run ESLint'
run: yarn run eslint app/javascript/**/*.js --ext .js
114 changes: 45 additions & 69 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
@@ -1,100 +1,76 @@
name: Run Tests (mySQL)
name: Tests - MySQL

on: [pull_request]

jobs:
mysql:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

# Define environment variables for MySQL and Rails
env:
DB_ADAPTER: mysql2
MYSQL_PWD: root
RAILS_ENV: test
WICKED_PDF_PATH: vendor/bundle/bin/wkhtmltopdf

steps:
# Checkout the repo
- uses: actions/checkout@v1
with:
fetch-depth: 1

# Install the necessary MySQL dev packages
- name: 'Install Mysql Packages'
run: |
sudo apt-get update
sudo apt-get install -y mysql-client libmysqlclient-dev
- uses: actions/checkout@v3

# Extract the Ruby version from the Gemfile.lock
- name: 'Determine Ruby Version'
run: echo ::set-env name=RUBY_VERSION::$(echo `cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`)

# Install Ruby - using the version found in the Gemfile.lock
- name: 'Install Ruby'
uses: actions/setup-ruby@v1
# Install Ruby and run bundler
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true

# Install Node
- uses: actions/setup-node@v3
with:
ruby-version: ${{ env.RUBY_VERSION }}
node-version: 18
cache: 'yarn'

# Copy all of the example configs over
- name: 'Setup Default Configuration'
- name: 'Setup the application'
run: |
# Make copies of all the example config files
cp config/branding.yml.sample config/branding.yml
cp config/database.yml.sample config/database.yml
cp config/secrets.yml.sample config/secrets.yml
cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
cp config/initializers/devise.rb.example config/initializers/devise.rb
cp config/initializers/recaptcha.rb.example config/initializers/recaptcha.rb
cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
cp .env.mysql2 .env

# Try to retrieve the gems from the cache
- name: 'Cache Gems'
uses: actions/cache@v1
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gem-

# Install bundler and run bundle install
- name: 'Bundle Install'
run: |
gem install bundler -v 1.17.2
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3 --without pgsql rollbar aws
# Stub out the Rails credentials file so that we can start the Rails app
- name: 'Setup Credentials'
run: EDITOR="sh -c 'echo \"$(cat config/credentials.yml.mysql2)\" > \$1' --" bundle exec rails credentials:edit

# Try to retrieve the yarn JS dependencies from the cache
- name: 'Cache Yarn Packages'
uses: actions/cache@v1
with:
path: node_modules/
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-yarn-
${{ runner.os }}-
# Set the path to the wkhtmltopdf executable
- name: 'Determine wkhtmltopdf location'
run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV

# Install the JS dependencies
# Run yarn install for JS dependencies
- name: 'Yarn Install'
run: |
yarn install
run: yarn install

# Setup the database
- name: 'Setup Test DB'
run: bundle exec rake db:setup RAILS_ENV=test
# Start the DB server and initialize the DB
- name: 'Start MySQL'
run: sudo systemctl start mysql

# Compile the assets
- name: 'Compile Assets'
- name: 'Build out the test database'
run: |
bundle exec rake webpacker:compile RAILS_ENV=test
bundle exec rake assets:precompile RAILS_ENV=test
DISABLE_SPRING=1 bundle exec rails db:create RAILS_ENV=test
DISABLE_SPRING=1 bundle exec rails db:schema:load RAILS_ENV=test

- name: 'Run any pending database migrations'
run: bin/rails db:migrate RAILS_ENV=test

# Prebuild the CSS, JS and image assets
- name: 'Precompile all of the Assets'
run: bundle exec rails assets:precompile

# Run the JS tests
- name: 'Run Karma Tests'
# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
run: |
yarn add karma
yarn run test
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
bundle exec rspec spec/mixins/

# Run the Rspec tests
- name: 'Run Rspec Tests'
run: bundle exec rspec spec/
# Run the time consuming integration tests (using Chrome headless browser)
- name: 'Run Rspec Integration Tests'
run: bundle exec rspec spec/features/
Loading