Merge pull request #4528 from dodona-edu/fix/boilerplate-makes-eddito…

…r-empty Fix the restore boilerplate button
dodona-edu · Mar 30, 2023 · dccd211 · dccd211
2 parents abcead5 + f7e5512
commit dccd211
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/app/assets/javascripts/exercise.ts b/app/assets/javascripts/exercise.ts
@@ -454,7 +454,12 @@ function initExerciseShow(exerciseId: number, programmingLanguage: string, logge
 
  const resetButton = restoreWarning.querySelector("a");
  resetButton.addEventListener("click", () => {
- editor.setValue(boilerplate);
+ // the boilerplate has been escaped, so we need to unescape it
+ const wrapper = document.createElement("div");
+ wrapper.innerHTML = boilerplate;
+ const rawBoilerplate = wrapper.textContent || wrapper.innerText || "";
+
+ editor.setValue(rawBoilerplate);
  editor.focus();
  restoreWarning.hidden = true;
  });

diff --git a/app/views/activities/show.html.erb b/app/views/activities/show.html.erb
@@ -182,7 +182,7 @@ end %>
  <%= @course&.id || "null" %>,
  <%= raw "\"#{@series&.deadline&.httpdate}\"" || "null" %>,
  "<%= submissions_url %>",
- `<%= (@activity.exercise? && raw(@activity.boilerplate&.gsub!('`', '\\\\`')))|| "" %>`,
+ `<%= (@activity.exercise? && @activity.boilerplate&.gsub('`', '\\\\`'))|| "" %>`,
  );
  });
 </script>
diff --git a/babel.config.js b/babel.config.js
@@ -40,7 +40,7 @@ module.exports = function (api) {
  "@babel/plugin-syntax-dynamic-import",
  "@babel/plugin-transform-for-of",
  isTestEnv && "babel-plugin-dynamic-import-node",
- isDevelopmentEnv && ["istanbul", { include: ["app/assets/javascripts/**/*.{js,ts}"] }],
+ isDevelopmentEnv && ["istanbul", { include: ["app/assets/javascripts/**/*.{js,ts}"], coverageGlobalScopeFunc: false, coverageGlobalScope: "window" }],
  "@babel/plugin-transform-destructuring",
  ["@babel/plugin-proposal-class-properties", { loose: true }],
  ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],

diff --git a/test/system/activities_test.rb b/test/system/activities_test.rb
@@ -39,22 +39,24 @@ class ActivitiesTest < ApplicationSystemTestCase
  end
 
  test 'should show message to restore boilerplate if latest submission is shown' do
- @instance.stubs(:boilerplate).returns('boilerplate') do
- create(:submission, exercise: @instance, user: @user, status: :correct, code: 'print("hello")')
- visit exercise_path(id: @instance.id)
- assert_text 'Restore boilerplate'
- end
+ Exercise.any_instance.stubs(:boilerplate).returns('boilerplate')
+ create(:submission, exercise: @instance, user: @user, status: :correct, code: 'print("hello")')
+ visit exercise_path(id: @instance.id)
+ assert_text 'Restore the boilerplate code.'
+ find('a', text: 'Restore the boilerplate code.').click
+ assert_text 'boilerplate'
  end
 
  test 'should not break on complex unicode characters' do
- @instance.stubs(:boilerplate).returns('`<script>alert("😀")</script>`') do
-  visit exercise_path(id: @instance.id)
-  assert_text '`<script>alert("😀")</script>`'
+ Exercise.any_instance.stubs(:boilerplate).returns('`<script>alert("😀")</script>`')
+ visit exercise_path(id: @instance.id)
+ assert_text '`<script>alert("😀")</script>`'
 
- create(:submission, exercise: @instance, user: @user, status: :correct, code: 'print("😀")')
- visit exercise_path(id: @instance.id)
- assert_text 'print("😀")'
- assert_text 'Restore boilerplate'
- end
+ create(:submission, exercise: @instance, user: @user, status: :correct, code: 'print("😀")')
+ visit exercise_path(id: @instance.id)
+ assert_text 'print("😀")'
+ assert_text 'Restore the boilerplate code.'
+ find('a', text: 'Restore the boilerplate code.').click
+ assert_text '`<script>alert("😀")</script>`'
  end
 end