diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3aea10db..c7277c32a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Continuous Integration on: push: - branches: [master, bonnie-prior] + branches: [master, staging] pull_request: - branches: [master, bonnie-prior] + branches: [master, staging] jobs: #----main job for teaspoon tests------- diff --git a/config/deploy/local.rb b/config/deploy/local.rb index 748491a72..5172f5d87 100644 --- a/config/deploy/local.rb +++ b/config/deploy/local.rb @@ -5,7 +5,7 @@ set :stage, :production # Tell RVM to use the current ruby when running capistrano -set :rvm1_ruby_version, '2.4.5' +set :rvm1_ruby_version, '2.7.2' # Set the branch to the currently checked out branch set :branch, `git rev-parse --abbrev-ref HEAD`.chomp diff --git a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee index 5992f2708..0380dd316 100644 --- a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee +++ b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee @@ -36,7 +36,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> expect(editCodeSelectionView.codeSystems.includes("ICD-10-CM")).toBe true it "selects default code after deletion", -> - # delete the 2 codes on the first sdc +# delete the 2 codes on the first sdc $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click()