Merge pull request #19938 from code-dot-org/strip-emoji

strip emoji from application notes field
code-dot-org · Jan 11, 2018 · 1bbc4aa · 1bbc4aa
2 parents b669eaf + 5e79b18
commit 1bbc4aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/dashboard/app/controllers/api/v1/pd/applications_controller.rb b/dashboard/app/controllers/api/v1/pd/applications_controller.rb
@@ -96,6 +96,8 @@ def update
     end
     application_data["regional_partner_id"] = application_data.delete "regional_partner_filter"
 
+    application_data["notes"] = application_data["notes"].strip_utf8mb4 if application_data["notes"]
+
     @application.update!(application_data)
 
     # only allow those with full management permission to lock or unlock

diff --git a/dashboard/test/controllers/api/v1/pd/applications_controller_test.rb b/dashboard/test/controllers/api/v1/pd/applications_controller_test.rb
@@ -185,6 +185,14 @@ class ApplicationsControllerTest < ::ActionController::TestCase
       refute data['locked']
     end
 
+    test 'notes field will strip pandas' do
+      sign_in @workshop_organizer
+      put :update, params: {id: @csf_facilitator_application_with_partner, application: {notes: panda_panda}}
+      assert_response :success
+      data = JSON.parse(response.body)
+      assert_equal data['notes'], "Panda"
+    end
+
     test 'csv download for csd teacher returns expected columns' do
       sign_in @workshop_admin