Support nested script object for section updates

code-dot-org · Jun 7, 2018 · 42f6cdc · 42f6cdc
1 parent d9f184b
commit 42f6cdc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/dashboard/app/controllers/sections_controller.rb b/dashboard/app/controllers/sections_controller.rb
@@ -13,7 +13,11 @@ def update
     authorize! :manage, section
 
     course_id = params[:course_id]
-    script_id = params[:script_id] || params[:script][:id]
+
+    # This endpoint needs to satisfy two endpoint formats for getting script_id
+    # This should be updated soon to always expect params[:script_id]
+    script_id = params[:script][:id] if params[:script]
+    script_id ||= params[:script_id]
 
     if script_id
       script = Script.get_from_cache(script_id)

diff --git a/dashboard/test/controllers/sections_controller_test.rb b/dashboard/test/controllers/sections_controller_test.rb
@@ -266,4 +266,16 @@ class SectionsControllerTest < ActionController::TestCase
 
     assert_not_nil UserScript.find_by(script: Script.artist_script, user: student)
   end
+
+  test "update: can set script from nested script param" do
+    sign_in @teacher
+    section = create(:section, user: @teacher, script_id: Script.flappy_script.id)
+    post :update, as: :json, params: {
+      id: section.id,
+      script: {id: @script_in_course.id}
+    }
+    assert_response :success
+    section.reload
+    assert_equal(@script_in_course.id, section.script_id)
+  end
 end