Merge branch 'master' of https://github.com/OSC/ondemand into 3081-pm…

…-env-variables

SECURITY.md

@@ -1,6 +1,6 @@
 # Security Policy
 
-This document outlines security procedures and general policies for the `OnDemand`
+This document outlines security procedures and general policies for the `Open OnDemand`
 project.
 
 ## Reporting a Vulnerability
@@ -26,12 +26,8 @@ involving the following steps:
 ## Comments on this Policy
 
 If you have suggestions on how this process could be improved please submit 
-a ticket, open a [Discorse](https://discourse.osc.edu/) topic or open a pull request.
+a ticket, open a [Discourse](https://discourse.openondemand.org/) topic or open a pull request.
 
 ## Security Audits
 
-[Trusted CI](https://trustedci.org/), the NSF Cybersecurity Center of 
-Excellence, conducted an in-depth vulnerability assessment of Open OnDemand, completing 
-it in December 2018. This assessment included a careful review of the code, increasing 
-our confidence in its security. The Ohio Supercomputing Center addressed the implementation 
-issues (bugs) that were found during this review, producing a more robust revision of Open OnDemand.
+The Open OnDemand core development team has had several engagements with [Trusted CI](https://trustedci.org/), the NSF Cybersecurity Center of Excellence. The first engagement was in 2018, during which Trusted CI conducted an in-depth vulnerability assessment and identified a few implementation issues that the Open OnDemand developers subsequently addressed.  [A report of that 2018 engagement is available here.](https://openondemand.org/trustedci-2018) The next engagement was in early 2021 and had three objectives: (1) integrate security automation into DevOps flows; (2) transfer skills for vulnerability assessments; and (3) develop needed security policies, practices, and procedures.  [A report of that 2021 engagement is available here.](https://openondemand.org/trustedci) 

apps/dashboard/test/system/batch_connect_test.rb

@@ -1361,7 +1361,7 @@ def make_bc_app(dir, form)
       click_on('Select Path')
 
       # shows the OodFilesApp.candidate_favorite_paths favorites
-      favorites = all('#favorites li')
+      favorites = all('#favorites li', wait: 5)
       assert_equal(2, favorites.size)
       assert_equal('/tmp', favorites[0].text.strip)
       assert_equal('/var', favorites[1].text.strip)
@@ -1396,7 +1396,7 @@ def make_bc_app(dir, form)
       click_on('Select Path')
 
       # favorites that have been configured in yml
-      favorites = all('#favorites li')
+      favorites = all('#favorites li', wait: 5)
       assert_equal(2, favorites.size)
       assert_equal('/fs/ess', favorites[0].text.strip)
       assert_equal('/fs/scratch', favorites[1].text.strip)
@@ -1433,7 +1433,7 @@ def make_bc_app(dir, form)
       click_on('Select Path')
 
       # no favorites show up
-      favorites = all('#favorites li')
+      favorites = all('#favorites li', wait: 5)
       assert_equal(0, favorites.size)
     end
   end

apps/dashboard/test/system/project_manager_test.rb

@@ -907,7 +907,7 @@ def add_auto_environment_variable(project_id, script_id, save: true)
       OodCore::Job::Adapters::Slurm.any_instance
                                    .stubs(:info).returns(OodCore::Job::Info.new(id: 'job-id-123', status: :running))
 
-      find("form[action='/projects/#{project_id}/launchers/8woi7ghd/submit']").click
+      click_on I18n.t('dashboard.batch_connect_form_launch')
       assert_selector('.alert-success', text: 'job-id-123')
     end
   end