Skip to content
Merged
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
39 changes: 22 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GEM
marcel (~> 1.0)
nokogiri (~> 1.10, >= 1.10.4)
rubyzip (>= 1.3.0, < 3)
cgi (0.4.1)
cgi (0.4.2)
charlock_holmes (0.7.9)
childprocess (5.1.0)
logger (~> 1.5)
Expand Down Expand Up @@ -225,6 +225,7 @@ GEM
libv8-node (18.19.0.0-arm64-darwin)
libv8-node (18.19.0.0-x86_64-darwin)
libv8-node (18.19.0.0-x86_64-linux)
lint_roller (1.1.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -255,13 +256,14 @@ GEM
net-ldap
rails (>= 7.0, < 7.3)
yubikey
ndr_dev_support (7.2.6)
ndr_dev_support (7.3.2)
activesupport (>= 6.1, < 8.1)
brakeman (>= 4.7.1)
bundler-audit
capistrano (~> 2.15)
capybara (>= 3.34)
capybara-screenshot
csv
github-linguist
highline (>= 1.6.0)
minitest (~> 5.11)
Expand Down Expand Up @@ -318,7 +320,7 @@ GEM
ndr_support (~> 5.0)
rails (>= 7.0, < 8.1)
nenv (0.3.0)
net-imap (0.5.6)
net-imap (0.5.8)
date
net-protocol
net-ldap (0.19.0)
Expand Down Expand Up @@ -385,7 +387,7 @@ GEM
puma (>= 5.0)
rack
racc (1.8.1)
rack (2.2.11)
rack (2.2.17)
rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -428,7 +430,7 @@ GEM
ffi (~> 1.0)
regexp-examples (1.6.0)
regexp_property_values (~> 1.5)
regexp_parser (2.9.2)
regexp_parser (2.9.3)
regexp_property_values (1.5.2)
reline (0.5.11)
io-console (~> 0.5)
Expand All @@ -445,29 +447,32 @@ GEM
nokogiri
roo (>= 2.0.0, < 3)
spreadsheet (> 0.9.0)
rubocop (1.68.0)
rubocop (1.74.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.1)
parser (>= 3.3.1.0)
rubocop-rails (2.27.0)
rubocop-rails (2.30.3)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop (>= 1.72.1, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rake (0.7.1)
lint_roller (~> 1.1)
rubocop (>= 1.72.1)
ruby-ole (1.2.13.1)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby-saml (1.17.0)
ruby-saml (1.18.0)
nokogiri (>= 1.13.10)
rexml
ruby2_keywords (0.0.5)
Expand Down
7 changes: 4 additions & 3 deletions test/integration/application_project_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ApplicationProjectTest < ActionDispatch::IntegrationTest
select @user.full_name, from: 'Application Manager'
click_button 'Apply'
end
assert_text 'Application was successfully assigned'

accept_confirm { click_button 'Begin DPIA' }

Expand All @@ -48,14 +49,14 @@ class ApplicationProjectTest < ActionDispatch::IntegrationTest

click_button 'Reject DPIA'
assert_assignment_email(assignee: @user, assigner: @peer, comments: 'not today!') do
within_modal(selector: '#modal-dpia_rejected') do
within('#modal-dpia_rejected') do
select @user.full_name, from: 'project[project_state][assigned_user_id]'
fill_in 'project_comments_attributes_0_body', with: 'not today!'
click_button 'Save'
end
assert has_text? 'DPIA Rejected'
end

assert has_text? 'DPIA Rejected'
assert has_no_button?('Begin DPIA')

change_sign_in @user
Expand Down Expand Up @@ -306,7 +307,7 @@ class ApplicationProjectTest < ActionDispatch::IntegrationTest
def reassign_for_moderation_to(assignee:, assigner:)
assert_assignment_email(assignee: assignee, assigner: assigner) do
click_button 'Send for Peer Review'
within_modal(selector: '#modal-dpia_review') do
within('#modal-dpia_review') do
select assignee.full_name, from: 'project[project_state][assigned_user_id]'
click_button 'Save'
end
Expand Down
7 changes: 6 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@

require_relative 'download_helpers'

Capybara.server = :puma, { Silent: true }
# Supporting multiple threads allows assets to be served faster:
Capybara.server = :puma, { Silent: true, Threads: '0:4' }

# When running in parallel, there can be occassional chokes, so this accounts for that.
# This shouldn't slow down tests that are well-written.
Capybara.default_max_wait_time = 10.seconds

Capybara.disable_animation = true

# Devise support for functional / integration test
module ActionDispatch
class IntegrationTest
Expand Down Expand Up @@ -154,9 +157,11 @@ class TestCase
def login_and_accept_terms(user)
sign_in user
visit terms_and_conditions_path
assert_text user.email
return if page.has_text?('Terms and Conditions have been accepted')

click_on 'Accept'
assert_text /Welcome to Data Management System|Projects Dashboard/
end

def within_row(text)
Expand Down
Binary file removed vendor/cache/cgi-0.4.1.gem
Binary file not shown.
Binary file added vendor/cache/cgi-0.4.2.gem
Binary file not shown.
Binary file added vendor/cache/lint_roller-1.1.0.gem
Binary file not shown.
Binary file removed vendor/cache/ndr_dev_support-7.2.6.gem
Binary file not shown.
Binary file added vendor/cache/ndr_dev_support-7.3.2.gem
Binary file not shown.
Binary file removed vendor/cache/net-imap-0.5.6.gem
Binary file not shown.
Binary file added vendor/cache/net-imap-0.5.8.gem
Binary file not shown.
Binary file removed vendor/cache/rack-2.2.11.gem
Binary file not shown.
Binary file added vendor/cache/rack-2.2.17.gem
Binary file not shown.
Binary file removed vendor/cache/regexp_parser-2.9.2.gem
Binary file not shown.
Binary file added vendor/cache/regexp_parser-2.9.3.gem
Binary file not shown.
Binary file removed vendor/cache/rubocop-1.68.0.gem
Binary file not shown.
Binary file added vendor/cache/rubocop-1.74.0.gem
Binary file not shown.
Binary file removed vendor/cache/rubocop-ast-1.36.1.gem
Binary file not shown.
Binary file added vendor/cache/rubocop-ast-1.38.1.gem
Binary file not shown.
Binary file removed vendor/cache/rubocop-rails-2.27.0.gem
Binary file not shown.
Binary file added vendor/cache/rubocop-rails-2.30.3.gem
Binary file not shown.
Binary file removed vendor/cache/rubocop-rake-0.6.0.gem
Binary file not shown.
Binary file added vendor/cache/rubocop-rake-0.7.1.gem
Binary file not shown.
Binary file removed vendor/cache/ruby-saml-1.17.0.gem
Binary file not shown.
Binary file added vendor/cache/ruby-saml-1.18.0.gem
Binary file not shown.
Loading